From 8cb3558a27492ec3e16357f18511f39e54f30d00 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 29 Mar 2019 14:52:50 +0300 Subject: [PATCH] server: add ability to restart clever service after file uploading --- Server/server.py | 4 ++-- Server/server_qt.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/server.py b/Server/server.py index 8a01581..f70dfc9 100644 --- a/Server/server.py +++ b/Server/server.py @@ -340,10 +340,10 @@ class Client: return self._request_queue.pop(requested_value) @requires_connect - def send_file(self, filepath, dest_filename): + def send_file(self, filepath, dest_filename, clever_restart = False): print("Sending file ", dest_filename) chunk_count = math.ceil(os.path.getsize(filepath) / Server.BUFFER_SIZE) - self.send(Client.form_message("writefile", {"filesize": chunk_count, "filename": dest_filename})) + self.send(Client.form_message("writefile", {"filesize": chunk_count, "filename": dest_filename, "clever_restart": clever_restart})) with open(filepath, 'rb') as file: chunk = file.read(Server.BUFFER_SIZE) while chunk: diff --git a/Server/server_qt.py b/Server/server_qt.py index dc21e93..efb854e 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -166,7 +166,7 @@ class MainWindow(QtWidgets.QMainWindow): item = model.item(row_num, 0) if item.isCheckable() and item.checkState() == Qt.Checked: copter = Client.get_by_id(item.text()) - copter.send_file(path, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt") + copter.send_file(path, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt", clever_restart=True) model = QStandardItemModel()