not1mm 24.9.10.2__tar.gz → 24.9.11__tar.gz

{not1mm-24.9.10.2 → not1mm-24.9.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.10.2
+Version: 24.9.11
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -229,6 +229,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-11] Fixed the HamQTH call lookups.
 - [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
 - [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.

{not1mm-24.9.10.2 → not1mm-24.9.11}/README.md

@@ -198,6 +198,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-11] Fixed the HamQTH call lookups.
 - [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
 - [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.

{not1mm-24.9.10.2 → not1mm-24.9.11}/not1mm/lib/lookup.py

@@ -323,7 +323,7 @@ class HamQTH:
             return
         logger.info("resultcode: %s", query_result.status_code)
         baseroot = xmltodict.parse(query_result.text)
-        root = baseroot.get("HamQTH")
+        root = baseroot.get("HamQTH", {})
         session = root.get("session")
         if session:
             if session.get("session_id"):
@@ -344,55 +344,49 @@ class HamQTH:
             "error_text": False,
         }
         if self.session:
-            payload = {"id": self.session, "callsign": call, "prg": "wfdlogger"}
+            payload = {"id": self.session, "callsign": call, "prg": "not1mm"}
             try:
                 query_result = requests.get(self.url, params=payload, timeout=10.0)
             except requests.exceptions.Timeout:
                 self.error = True
                 return the_result
             logger.info("resultcode: %s", query_result.status_code)
-            baseroot = xmltodict.parse(query_result.text)
-            root = baseroot.get("HamQTH")
-            search = root.get("search")
-            session = root.get("session")
-            if not search:
-                if session:
-                    if session.get("error"):
-                        if session.get("error") == "Callsign not found":
-                            the_result["error_text"] = session.get("error")
-                            return the_result
-                        if session.get("error") == "Session does not exist or expired":
-                            self.getsession()
-                            query_result = requests.get(
-                                self.url, params=payload, timeout=10.0
-                            )
-            the_result = self.parse_lookup(root)
-        return the_result
 
-    @lru_cache(maxsize=1000)
-    def parse_lookup(self, root) -> dict:
-        """
-        Returns gridsquare and name for a callsign
-        Or False for both if none found or error.
-        """
-        the_result = {
-            "grid": False,
-            "name": False,
-            "nickname": False,
-            "error_text": False,
-        }
-        session = root.get("session")
-        search = root.get("search")
-        if session:
-            if session.get("error"):
-                the_result["error_text"] = session.get("error")
-        if search:
-            if search.get("grid"):
-                the_result["grid"] = search.get("grid")
-            if search.get("nick"):
-                the_result["nickname"] = search.get("nick")
-            if search.get("adr_name"):
-                the_result["name"] = search.get("adr_name")
+            query_dict = xmltodict.parse(query_result.text)
+
+            the_result["grid"] = (
+                query_dict.get("HamQTH", {}).get("search", {}).get("grid", False)
+            )
+            the_result["name"] = (
+                query_dict.get("HamQTH", {}).get("search", {}).get("name", False)
+            )
+            the_result["nickname"] = (
+                query_dict.get("HamQTH", {}).get("search", {}).get("nickname", False)
+            )
+            the_result["error_text"] = (
+                query_dict.get("HamQTH", {}).get("session", {}).get("error", False)
+            )
+
+            if the_result.get("error_text") == "Callsign not found":
+                return the_result
+            if the_result.get("error_text") == "Session does not exist or expired":
+                self.getsession()
+                query_result = requests.get(self.url, params=payload, timeout=10.0)
+                the_result["grid"] = (
+                    query_dict.get("HamQTH", {}).get("search", {}).get("grid", False)
+                )
+                the_result["name"] = (
+                    query_dict.get("HamQTH", {}).get("search", {}).get("name", False)
+                )
+                the_result["nickname"] = (
+                    query_dict.get("HamQTH", {})
+                    .get("search", {})
+                    .get("nickname", False)
+                )
+                the_result["error_text"] = (
+                    query_dict.get("HamQTH", {}).get("session", {}).get("error", False)
+                )
+
         return the_result
 
 

not1mm-24.9.11/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "24.9.11"

not1mm-24.9.11/not1mm/test.py

@@ -0,0 +1,13 @@
+import xmltodict
+
+# import xmlrpc.client
+
+# target = "http://127.0.0.1:8421"
+# server = xmlrpc.client.ServerProxy(target)
+# adif = "<QSO_DATE:8>20150721<QSO_DATE_OFF:8>20150721<TIME_ON:4>1333<TIME_OFF:6>133436<CALL:5>N3FJP<FREQ:8>3.081500<MODE:0><RST_SENT:0><RST_RCVD:0><TX_PWR:0><NAME:5>Glenn<QTH:7>Bel Air<STATE:2>MD<VE_PROV:0><COUNTRY:13>United States<GRIDSQUARE:6>FM19tm<STX:0><SRX:0><SRX_STRING:0><STX_STRING:0><NOTES:0><IOTA:0><DXCC:0><QSL_VIA:0><QSLRDATE:0><QSLSDATE:0><eor>"
+# response = server.log.add_record(adif)
+
+
+xml = '<?xml version="1.0"?>\n<HamQTH version="2.8" xmlns="https://www.hamqth.com">\n    <search>\n        <callsign>K6GTE</callsign>\n        <nick>Mike</nick>\n        <qth>Anaheim</qth>\n        <country>United States</country>\n        <adif>291</adif>\n        <itu>6</itu>\n        <cq>3</cq>\n        <grid>DM13AT</grid>\n        <adr_name>Michael C Bridak</adr_name>\n        <adr_street1>2854 W Bridgeport Ave</adr_street1>\n        <adr_city>Anaheim</adr_city>\n        <adr_zip>92804</adr_zip>\n        <adr_country>United States</adr_country>\n        <adr_adif>291</adr_adif>\n        <us_state>CA</us_state>\n        <us_county>Orange</us_county>\n        <lotw>Y</lotw>\n        <qsldirect>Y</qsldirect>\n        <qsl>?</qsl>\n        <eqsl>N</eqsl>\n        <email>michael.bridak@gmail.com</email>\n        <birth_year>1967</birth_year>\n        <lic_year>2017</lic_year>\n        <latitude>33.81</latitude>\n        <longitude>-117.97</longitude>\n        <continent>NA</continent>\n        <utc_offset>-8</utc_offset>\n        <picture>https://www.hamqth.com/userfiles/k/k6/k6gte/_header/header.jpg?ver=3</picture>\n    </search>\n</HamQTH>'
+result = xmltodict.parse(xml)
+print(f"{result=}")

{not1mm-24.9.10.2 → not1mm-24.9.11}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.10.2
+Version: 24.9.11
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -229,6 +229,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-11] Fixed the HamQTH call lookups.
 - [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
 - [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.

{not1mm-24.9.10.2 → not1mm-24.9.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.9.10.2"
+version = "24.9.11"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"

not1mm-24.9.10.2/not1mm/lib/version.py

@@ -1,3 +0,0 @@
-"""It's the version"""
-
-__version__ = "24.9.10.2"

not1mm-24.9.10.2/not1mm/test.py

@@ -1,6 +0,0 @@
-import xmlrpc.client
-
-target = "http://127.0.0.1:8421"
-server = xmlrpc.client.ServerProxy(target)
-adif = "<QSO_DATE:8>20150721<QSO_DATE_OFF:8>20150721<TIME_ON:4>1333<TIME_OFF:6>133436<CALL:5>N3FJP<FREQ:8>3.081500<MODE:0><RST_SENT:0><RST_RCVD:0><TX_PWR:0><NAME:5>Glenn<QTH:7>Bel Air<STATE:2>MD<VE_PROV:0><COUNTRY:13>United States<GRIDSQUARE:6>FM19tm<STX:0><SRX:0><SRX_STRING:0><STX_STRING:0><NOTES:0><IOTA:0><DXCC:0><QSL_VIA:0><QSLRDATE:0><QSLSDATE:0><eor>"
-response = server.log.add_record(adif)