last

Author: krysnox

client/client.py

@@ -72,6 +72,11 @@ def update_handler(self):
 						print(response["msg"])
 						file_written = response["file_written"]
 
+						for filename in file_written: #populate listbox again
+							self.listbox.insert(END, filename)
+							# listbox.insert(END, percent)
+							self.listbox.update_idletasks()
+
 						for file in file_written:
 							self._popup("Update", str(file)+" UPLOADED SUCCESSFULLY")
 
@@ -81,10 +86,14 @@ def update_handler(self):
 						# update on GUI
 
 						# self._update_canvas()
+<<<<<<< Updated upstream
 						for filename in file_written: #populate listbox again
 							self.listbox.insert(END, filename)
 							# listbox.insert(END, percent)
 							self.listbox.update_idletasks()
+=======
+						
+>>>>>>> Stashed changes
 						# tk.mainloop()
 						# self.window.mainloop()
 					elif response["status"] == "NO_UPD":
@@ -253,7 +262,8 @@ def _write(self, pg, pg_data):
 			self.processing[pg.pg_id] = pg_data
 			if self.start_update_handler == False:
 				self.start_update_handler = True
-				threading.Thread(target=self.update_handler())
+				self.update_handler()
+				# threading.Thread(target=self.update_handler())
 			s.close()
 			return 0
 
@@ -366,6 +376,38 @@ def gui(self):
 
 		self.window.mainloop()
 
+<<<<<<< Updated upstream
+=======
+	def _update_gui(self):
+		self.canvasG.delete('all')
+		scrollbar = tk.Scrollbar(self.canvasG)
+		# scrollbar.place(y=50)
+		scrollbar.pack( side = tk.RIGHT,
+				fill = tk.Y )
+		self.list_item = tk.StringVar()
+		# self.canvasG.configure(yscrollcommand=scrollbar.set)
+		self.listbox = tk.Listbox(self.canvasG, yscrollcommand = scrollbar.set, width=150, height=30,
+							listvariable=self.list_item, selectmode = 'browse' )
+		# mylist.place(x = 60, y=50)
+		file_list = []
+		self.file_id_map = {}
+		for d in self.dir_tree.keys():
+			for file_id in self.dir_tree[d].keys():
+				f_name = self.dir_tree[d][file_id][0]
+				file_list.append("/"+str(d)+"/"+str(f_name))
+				self.file_id_map[f_name] = file_id
+
+		for file in file_list:
+			self.listbox.insert(tk.END, file)
+
+		# mylist.place(x = 60, y=50)#, side = "left", fill = "both")
+		self.listbox.pack()#side = tk.LEFT, fill = tk.BOTH )
+		self.listbox.bind("<MouseWheel>", self.scrolllistbox)
+		self.listbox.bind('<Double-1>', self.download_file)
+		
+
+		scrollbar.config( command = self.listbox.yview)
+>>>>>>> Stashed changes
 
 	def browseFiles(self):
 		filename = filedialog.askopenfilename(initialdir = "/",

mds/logged_in

@@ -96,6 +96,10 @@ def dispatch_primary(self):
 			elif msg["type"] == "WRITE_QUERY":
 				res = self._client_query_handle(msg)
 				print(res["msg"])
+
+			elif msg["type"] == "RECOVERY":
+				res = self._recovery_handle()
+				print(res["msg"])
 
 			try:
 				_send_msg(c, res)
@@ -164,6 +168,10 @@ def dispatch_backup(self):
 					self._write_tree(username, tree)
 					res["status"] = "SUCCESS"
 
+			elif msg["type"] == "RECOVERY":
+				res = self._recovery_handle()
+				print(res["msg"])
+			
 			else:
 				res["status"] = "ERROR"
 				res["msg"] = "msg type not define !"
@@ -421,6 +429,18 @@ def _write_logged_in(self):
 
 		file.close()
 
+	def _recovery_handle(self):
+		trees = []
+		for username in self.user_list.keys():
+			tree = self._read_tree(username)
+			trees.append(tree)
+
+		logged_in = self._read_logged_in()
+
+		res = {"trees":trees, "logged_in":logged_in, "status":"SUCCESS", "msg":"delivered data for recovery"}
+
+		return res
+
 
 if __name__ == "__main__":
 	if len(sys.argv) != 2:

mds/mds.py

@@ -0,0 +1,68 @@
+import sys
+sys.path.insert(1, '../utils/')
+from info import MDS_IPs, MSG_SIZE
+from transfer import _send_msg, _recv_msg, _wait_recv_msg
+
+if len(sys.argv) < 2:
+	print("$ recovery.py primary")
+	exit(0)
+ip = 0
+port = 0
+if sys.argv[1] == "primary":
+
+	ip = MDS_IPs["backup"]["ip"]
+	port = MDS_IPs["backup"]["port"]
+
+else:
+	ip = MDS_IPs["primary"]["ip"]
+	port = MDS_IPs["primary"]["port"]
+
+
+print("receiving data..")
+s = socket.socket()         
+
+try:
+	s.connect((ip, port)) 
+	
+	msg = {"type":"RECOVERY"}
+	# d_msg = pickle.dumps(msg)
+	
+	_send_msg(s, msg)
+	#s.send(d_msg)
+	response = _wait_recv_msg(s, 1024)
+
+	if response["status"] == "SUCCESS":
+		trees = response["trees"]
+		logged_in = response["logged_in"]
+		# user_list = response["user_list"]
+
+		for tree in trees:
+			file = open("./tree/"+tree["username"], 'wb')
+
+			obj_b = pickle.dumps(tree)
+			file.write(obj_b)
+
+			file.close()
+
+		file = open("./logged_in", 'wb')
+
+		obj_b = pickle.dumps(logged_in)
+		file.write(obj_b)
+
+		file.close()
+
+		print("Successfully recovered...")
+	
+	elif response["status"] == "ERROR":
+		print(response["msg"])
+		print("Couldn't recover")
+
+
+except Exception as e:
+	print(e)
+	print("Couldn't recover")
+	return -2
+
+finally:
+	s.close()
+	print("...")