not1mm 24.9.10.1__py3-none-any.whl → 24.9.11__py3-none-any.whl

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/lib/version.py

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

not1mm/plugins/arrl_vhf_jan.py

@@ -379,7 +379,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",

not1mm/plugins/arrl_vhf_jun.py

@@ -347,7 +347,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",

not1mm/plugins/arrl_vhf_sep.py

@@ -347,7 +347,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",

not1mm/test.py

@@ -1,6 +1,13 @@
-import xmlrpc.client
+import xmltodict
 
-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)
+# 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.1.dist-info → not1mm-24.9.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.10.1
+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,8 @@ 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.
 - [24-9-9] Add IARU R1 Fieldday CW and SSB.

{not1mm-24.9.10.1.dist-info → not1mm-24.9.11.dist-info}/RECORD

@@ -5,7 +5,7 @@ not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/radio.py,sha256=eiB04LPMPBeMrBRI021Z7VXth66EOYb0Ujh11T9877c,3362
-not1mm/test.py,sha256=QE9lemU13glwB2yuBAuXXQHzADTW1vSX90HHu0F-Akg,496
+not1mm/test.py,sha256=xbGtnhdoX16C6nrqzLDydqgQtiWxYWmZ2NN74DF-VLM,1736
 not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
@@ -102,7 +102,7 @@ not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,19
 not1mm/lib/fldigi_watcher.py,sha256=k_fAaJLdt4mwyKKnpiZrV-rSFtRbi2C8y1Dg3eyILIU,883
 not1mm/lib/ft8_watcher.py,sha256=npHTjO5mtg3lvYSK6G8BEMMrtZ_1M5xM6Q8NnEQ6MlI,4585
 not1mm/lib/ham_utility.py,sha256=uRErxCxZr8dfxzekPyett0e_BABDVOCvSUUTzXq6ctE,11790
-not1mm/lib/lookup.py,sha256=F2fl5QkMxaGSxl1XMWnLUub3T9Mt7LhCX4acOlAsks4,13952
+not1mm/lib/lookup.py,sha256=i7ZF1bzJ_ofbE_r2OEEud0lKOOiDfeis8CVUo3s2pdI,13801
 not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
@@ -111,7 +111,7 @@ not1mm/lib/plugin_common.py,sha256=yefvcX61fXSjs__OPssJqVlZyg1AlcV1VDkl2MQP6kk,9
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=FsT8NybU1I3-e0Sd5gaO4VWJIKAAhZz4pg_TeHhi4bY,50
+not1mm/lib/version.py,sha256=PRDQULwkAoI16hhI1s6tqTEDizLTC5n4WBqgKX9RDzc,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -125,9 +125,9 @@ not1mm/plugins/arrl_field_day.py,sha256=pivtEK5j9sLpta12_wuUQYvs7MuiP3JfhlO-AOID
 not1mm/plugins/arrl_rtty_ru.py,sha256=hKUS4isjdXo3EYxQrsqsDupPp2chW8fpoWj0T1pTgJ4,7994
 not1mm/plugins/arrl_ss_cw.py,sha256=4yN68xZMuJRaSUfdiY4hafC07A3lifl5q6DEUZ-oYPQ,13080
 not1mm/plugins/arrl_ss_phone.py,sha256=Yzc5sNjrY8TlnozbYF6k8hbEamyDuUAD_3-BNqHgXqY,13068
-not1mm/plugins/arrl_vhf_jan.py,sha256=8unKMzQFLGovp_nwhwb-CQoTcrdybhO5ezy15-pup7Q,15610
-not1mm/plugins/arrl_vhf_jun.py,sha256=81of8nIKvmYoDdDA7ZA6xwaHIUhbKayutNWwrcyUGOo,14629
-not1mm/plugins/arrl_vhf_sep.py,sha256=4d4P6OSFHkEoheAjCrzrmR-2eOXH98FCyj-YXVBd2ks,14629
+not1mm/plugins/arrl_vhf_jan.py,sha256=bSZM7NHa-B1tKY71Bh2VD6gATHw6xkwuLYxe9K8zk-Y,15604
+not1mm/plugins/arrl_vhf_jun.py,sha256=B2nmz4nS3Al2v0Un2bey5ueGhfa4jN3l_nEsj1AZecc,14623
+not1mm/plugins/arrl_vhf_sep.py,sha256=iG_Bt6JvmDSUYhmAoWYM0f8kuqWGblAn61DXclVTgXU,14623
 not1mm/plugins/canada_day.py,sha256=OVpcCl1Chse_zLHf6PayTrgawWM4W-pmrTw40Al-o9s,11998
 not1mm/plugins/cq_160_cw.py,sha256=5s6rIZdJEnmWe1SI06BEyz7p5vP0N2n9mI4l_mZ0icw,14139
 not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,14182
@@ -152,9 +152,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.9.10.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.10.1.dist-info/METADATA,sha256=01uc-_drLCMliBrL12Y_2neEEpRBMnU-754H0O6Wucc,30714
-not1mm-24.9.10.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-not1mm-24.9.10.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.10.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.10.1.dist-info/RECORD,,
+not1mm-24.9.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.9.11.dist-info/METADATA,sha256=5tjX7J_9Rn7ZKjVSSwYyBocTPmhPSJU2IoB8Zwx1FzU,30827
+not1mm-24.9.11.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+not1mm-24.9.11.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.9.11.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.9.11.dist-info/RECORD,,