diff --git a/Server/server_gui.ui b/Server/server_gui.ui index 36569a1..bb58ced 100644 --- a/Server/server_gui.ui +++ b/Server/server_gui.ui @@ -7,7 +7,7 @@ 0 0 1220 - 750 + 761 @@ -466,7 +466,7 @@ - Send launch file to clever + Send launch files diff --git a/Server/server_qt.py b/Server/server_qt.py index 846e012..eed0560 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -419,12 +419,14 @@ class MainWindow(QtWidgets.QMainWindow): @pyqtSlot() def send_launch(self): - path = QFileDialog.getOpenFileName(self, "Select launch file for clever", filter="Launch files (*.launch)")[0] + path = str(QFileDialog.getExistingDirectory(self, "Select directory with launch files")) if path: - filename = os.path.basename(path) - print("Selected file:", path, filename) + print("Selected directory:", path) + files = [file for file in glob.glob(path + '/*.launch')] for copter in self.model.user_selected(): - copter.client.send_file(path, "/home/pi/catkin_ws/src/clever/clever/launch/{}".format(filename)) + for file in files: + filename = os.path.basename(file) + copter.client.send_file(file, "/home/pi/catkin_ws/src/clever/clever/launch/{}".format(filename)) # copter.client.send_message("service_restart", {"name": "clever"}) @pyqtSlot() diff --git a/messaging_lib.py b/messaging_lib.py index 357e7f1..1cb0383 100644 --- a/messaging_lib.py +++ b/messaging_lib.py @@ -383,7 +383,7 @@ class ConnectionManager(object): logger.error("File {} can not be written due error: {}".format(filepath, error)) else: logger.info("File {} successfully received ".format(filepath)) - os.system("chown -R pi:pi /home/pi/clever-show") + os.system("chown -R pi:pi /home/pi/clever-show/") def write(self): with self._send_lock: