diff --git a/web_app/LogManager.py b/web_app/LogManager.py index 13711108..98692b2a 100644 --- a/web_app/LogManager.py +++ b/web_app/LogManager.py @@ -64,7 +64,7 @@ def updateAvailableLogs(self): "is_being_converted": is_being_converted }) - self.available_logs.sort(key = lambda date: date['name'], reverse = True) + self.available_logs.sort(key = lambda date: date['name'], reverse = True) #Adding an id to each log id = 0 diff --git a/web_app/RTKBaseConfigManager.py b/web_app/RTKBaseConfigManager.py index cf1c7290..3444f6c6 100644 --- a/web_app/RTKBaseConfigManager.py +++ b/web_app/RTKBaseConfigManager.py @@ -87,12 +87,12 @@ def expand_path(self): """ datadir = self.config.get("local_storage", "datadir") if "$BASEDIR" in datadir: - exp_datadir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../", datadir.strip("$BASEDIR/"))) + exp_datadir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../", datadir.removeprefix("$BASEDIR/"))) self.update_setting("local_storage", "datadir", exp_datadir) logdir = self.config.get("log", "logdir") if "$BASEDIR" in logdir: - exp_logdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../", logdir.strip("$BASEDIR/"))) + exp_logdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../", logdir.removeprefix("$BASEDIR/"))) self.update_setting("log", "logdir", exp_logdir) def listvalues(self): diff --git a/web_app/RTKLIB.py b/web_app/RTKLIB.py index 3f76b88b..5c5e4f0f 100644 --- a/web_app/RTKLIB.py +++ b/web_app/RTKLIB.py @@ -372,7 +372,7 @@ def shutdown(self): # shutdown base - elif self.state == "base": + if self.state == "base": return self.shutdownBase() # otherwise, we are inactive @@ -412,8 +412,7 @@ def processLogPackage(self, raw_log_path): currently_converting = False try: - print("conversion thread is alive " + str(self.conversion_thread.isAlive())) - currently_converting = self.conversion_thread.isAlive() + currently_converting = self.conversion_thread.is_alive() except AttributeError: pass diff --git a/web_app/Str2StrController.py b/web_app/Str2StrController.py index 7f35a1a4..51b088af 100644 --- a/web_app/Str2StrController.py +++ b/web_app/Str2StrController.py @@ -178,7 +178,7 @@ def setTCPClientStream(self, tcp_client_parameters = None, input = True, format if tcp_client_parameters is None: tcp_client_parameters = def_parameters - port = "tcpcli://" + ":".join(tcp_server_parameters) + port = "tcpcli://" + ":".join(tcp_client_parameters) self.setPort(port, input, format) @@ -193,7 +193,7 @@ def setTCPServerStream(self, tcp_server_parameters = None, input = True, format if tcp_server_parameters is None: tcp_server_parameters = def_parameters - port = "tcpsvr://:" + def_parameters[0] + port = "tcpsvr://:" + tcp_server_parameters[0] self.setPort(port, input, format) @@ -219,9 +219,9 @@ def setNTRIPServerStream(self, ntrip_server_parameters = None, input = True, for # 4. mount point # 5. str ??? - port = "ntrips://:" + ntrip_client_parameters[0] + "@" + ntrip_client_parameters[1] - port += ":" + ntrip_client_parameters[2] + "/" + ntrip_client_parameters[3] + ":" - port += ntrip_client_parameters[4] + port = "ntrips://:" + ntrip_server_parameters[0] + "@" + ntrip_server_parameters[1] + port += ":" + ntrip_server_parameters[2] + "/" + ntrip_server_parameters[3] + ":" + port += ntrip_server_parameters[4] self.setPort(port, input, format) diff --git a/web_app/network_infos.py b/web_app/network_infos.py index f71b92e3..ac5b2716 100644 --- a/web_app/network_infos.py +++ b/web_app/network_infos.py @@ -83,10 +83,14 @@ def get_interfaces_infos(): log.debug("{} : {} : {}".format(k, part.family.name, part.address)) device_info["ipv4"] = ipv4 if len(ipv4) > 0 else None device_info["ipv6"] = ipv6 if len(ipv6) > 0 else None - conn_name = get_conn_name(k) - if conn_name: - device_info["conn_name"] = conn_name - device_info["hwaddr"] = nmcli.device.show(k).get('GENERAL.HWADDR') + try: + device_show = nmcli.device.show(k) + conn_name = device_show.get("GENERAL.CONNECTION") + if conn_name: + device_info["conn_name"] = conn_name + device_info["hwaddr"] = device_show.get('GENERAL.HWADDR') + except nmcli.NotExistException: + log.debug("No device info for {}".format(k)) interfaces_infos.append(device_info) return interfaces_infos diff --git a/web_app/server.py b/web_app/server.py index e36bbc49..5468b72d 100755 --- a/web_app/server.py +++ b/web_app/server.py @@ -965,6 +965,9 @@ def update_settings(json_msg): param json_msg: A json variable containing the source form and the new paramaters """ #print("received settings form", json_msg) + if not json_msg: + print("ERROR: update_settings received empty message") + return source_section = json_msg.pop().get("source_form") #print("section: ", source_section) if source_section == "change_password":