not1mm 25.6.16__tar.gz → 25.6.18__tar.gz

{not1mm-25.6.16 → not1mm-25.6.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.16
+Version: 25.6.18
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm/__main__.py

@@ -3398,9 +3398,9 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
                 return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
-            if self.pref.get("cwtype") == 2:
-                time.sleep(0.2)
-            return
+            # if self.pref.get("cwtype") == 2:
+            # time.sleep(0.3)
+            # return
 
     def toggle_run_sp(self) -> None:
         """Toggles the radioButton_run and radioButton_sp."""

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm/lib/lookup.py

@@ -74,27 +74,30 @@ class HamDBlookup:
             if root:
                 messages = root.get("messages")
                 callsign = root.get("callsign")
-            if messages:
-                error_text = messages.get("status")
-                logger.debug("HamDB: %s", error_text)
-                if error_text != "OK":
-                    self.error = False
-            if callsign:
-                logger.debug("HamDB: found callsign field")
-                if callsign.get("grid"):
-                    grid = callsign.get("grid")
-                if callsign.get("fname"):
-                    name = callsign.get("fname")
-                if callsign.get("name"):
-                    if not name:
-                        name = callsign.get("name")
-                    else:
-                        name = f"{name} {callsign.get('name')}"
-                if callsign.get("nickname"):
-                    nickname = callsign.get("nickname")
+                if messages is not None:
+                    error_text = messages.get("status")
+                    logger.debug("HamDB: %s", error_text)
+                    if error_text != "OK":
+                        self.error = False
+                if callsign is not None:
+                    logger.debug("HamDB: found callsign field")
+                    if callsign.get("grid"):
+                        grid = callsign.get("grid")
+                    if callsign.get("fname"):
+                        name = callsign.get("fname")
+                    if callsign.get("name"):
+                        if not name:
+                            name = callsign.get("name")
+                        else:
+                            name = f"{name} {callsign.get('name')}"
+                    if callsign.get("nickname"):
+                        nickname = callsign.get("nickname")
         else:
             self.error = True
             error_text = str(query_result.status_code)
+            logger.critical(
+                "HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text
+            )
         logger.info("HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text)
         return grid, name, nickname, error_text
 
@@ -166,12 +169,20 @@ class QRZlookup:
             )
 
             logger.info("\n\n%s\n\n", root)
-            logger.info(
-                "key:%s error:%s message:%s",
-                self.session,
-                self.error,
-                self.message,
-            )
+            if self.error:
+                logger.critical(
+                    "key:%s error:%s message:%s",
+                    self.session,
+                    self.error,
+                    self.message,
+                )
+            else:
+                logger.info(
+                    "key:%s error:%s message:%s",
+                    self.session,
+                    self.error,
+                    self.message,
+                )
         except requests.exceptions.RequestException as exception:
             logger.info("%s", exception)
             self.session = False
@@ -209,7 +220,7 @@ class QRZlookup:
                     )
                     baseroot = xmltodict.parse(query_result.text)
                     root = baseroot.get("QRZDatabase", {})
-        return root.get("Callsign")
+        return root.get("Callsign", {})
 
 
 class HamQTH:

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.6.16"
+__version__ = "25.6.18"

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm/lookupservice.py

@@ -40,14 +40,14 @@ class LookupService(QDockWidget):
 
             if self.settings.get("useqrz"):
                 self.look_up = QRZlookup(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
             if self.settings.get("usehamqth"):
                 self.look_up = HamQTH(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
     def get_settings(self) -> dict:
@@ -55,6 +55,7 @@ class LookupService(QDockWidget):
         if os.path.exists(fsutils.CONFIG_FILE):
             with open(fsutils.CONFIG_FILE, "rt", encoding="utf-8") as file_descriptor:
                 return loads(file_descriptor.read())
+        return {}
 
     def msg_from_main(self, packet):
         """"""
@@ -74,12 +75,12 @@ class LookupService(QDockWidget):
             self.look_up = None
             if self.settings.get("useqrz"):
                 self.look_up = QRZlookup(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
             if self.settings.get("usehamqth"):
                 self.look_up = HamQTH(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm/plugins/general_logging.py

@@ -184,19 +184,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 buttons_to_send.append(self.esm_dict["HISCALL"])
                 buttons_to_send.append(self.esm_dict["EXCH"])
 
-        #        elif self.current_widget in ["other_1", "other_2"]:
-        #            if self.other_2.text() == "" and self.other_1.text() == "":
-        #                self.make_button_green(self.esm_dict["AGN"])
-        #                buttons_to_send.append(self.esm_dict["AGN"])
-        #            else:
-        #                self.make_button_green(self.esm_dict["QRZ"])
-        #                buttons_to_send.append(self.esm_dict["QRZ"])
-        #                buttons_to_send.append("LOGIT")
-
         elif self.current_widget in ["other_1", "other_2"]:
-                self.make_button_green(self.esm_dict["QRZ"])
-                buttons_to_send.append(self.esm_dict["QRZ"])
-                buttons_to_send.append("LOGIT")
+            self.make_button_green(self.esm_dict["QRZ"])
+            buttons_to_send.append(self.esm_dict["QRZ"])
+            buttons_to_send.append("LOGIT")
 
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
@@ -211,19 +202,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 
-        #        elif self.current_widget in ["other_1", "other_2"]:
-        #            if self.other_2.text() == "" and self.other_1.text() == "":
-        #                self.make_button_green(self.esm_dict["AGN"])
-        #                buttons_to_send.append(self.esm_dict["AGN"])
-        #            else:
-        #                self.make_button_green(self.esm_dict["EXCH"])
-        #                buttons_to_send.append(self.esm_dict["EXCH"])
-        #                buttons_to_send.append("LOGIT")
-
         elif self.current_widget in ["other_1", "other_2"]:
-                self.make_button_green(self.esm_dict["QRZ"])
-                buttons_to_send.append(self.esm_dict["QRZ"])
-                buttons_to_send.append("LOGIT")
+            self.make_button_green(self.esm_dict["QRZ"])
+            buttons_to_send.append(self.esm_dict["QRZ"])
+            buttons_to_send.append("LOGIT")
 
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:

{not1mm-25.6.16 → not1mm-25.6.18}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.16
+Version: 25.6.18
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later

{not1mm-25.6.16 → not1mm-25.6.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.6.16"
+version = "25.6.18"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"