not1mm 24.11.6__py3-none-any.whl → 24.11.10__py3-none-any.whl

not1mm/__main__.py

@@ -1107,11 +1107,16 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         Nothing
         """
+
         if mode in ["CW", "SSB", "RTTY"]:
             freq = fakefreq(str(band), mode)
             self.change_freq(freq)
             vfo = float(freq)
             vfo = int(vfo * 1000)
+            if mode == "CW":
+                mode = self.rig_control.last_cw_mode
+            if mode == "RTTY":
+                mode = self.rig_control.last_data_mode
             self.change_mode(mode, intended_freq=vfo)
 
     def quit_app(self) -> None:
@@ -3315,10 +3320,9 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
             if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode("CW")
+                self.rig_control.set_mode(self.rig_control.last_cw_mode)
                 if self.pref.get("cwtype") == 3 and self.rig_control is not None:
                     if self.rig_control.interface == "flrig":
                         self.cwspeed_spinbox_changed()
@@ -3332,9 +3336,18 @@ class MainWindow(QtWidgets.QMainWindow):
             self.clearinputs()
             self.read_cw_macros()
             return
-        if mode == "RTTY":
+        if mode in (
+            "DIGI-U",
+            "DIGI-L",
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+        ):
             if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode("RTTY")
+                self.rig_control.set_mode(self.rig_control.last_data_mode)
             else:
                 self.radio_state["mode"] = "RTTY"
             self.setmode("RTTY")
@@ -3548,6 +3561,7 @@ class MainWindow(QtWidgets.QMainWindow):
         Passing in a dictionary object with the
         vfo freq, mode, bandwidth, and online state of the radio.
         """
+        logger.debug(f"{the_dict=}")
         self.set_radio_icon(0)
         info_dirty = False
         vfo = the_dict.get("vfoa", "")
@@ -3645,7 +3659,7 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-        if self.radio_state.get("mode") == "CW":
+        if self.radio_state.get("mode") in ("CW", "CW-L", "CW-R", "CWR"):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
             "RTTY",
@@ -3659,6 +3673,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "RTTYR",
             "PKTLSB",
             "PKTUSB",
+            "FSK",
         ):
             macro_file = "rttymacros.txt"
         else:
@@ -3687,7 +3702,11 @@ class MainWindow(QtWidgets.QMainWindow):
         temp directory this is running from... In theory.
         """
 
-        if self.radio_state.get("mode") == "CW":
+        if self.radio_state.get("mode") in (
+            "CW",
+            "CW-L",
+            "CW-R",
+        ):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
             "RTTY",

not1mm/lib/cat_interface.py

@@ -97,6 +97,7 @@ class CAT:
             self.__initialize_rigctrld()
         elif self.interface == "fake":
             self.online = True
+            logger.debug("Using Fake Rig")
         return
 
     def __initialize_rigctrld(self):
@@ -223,7 +224,9 @@ class CAT:
         """Poll the radio using flrig"""
         try:
             self.online = True
-            return self.server.rig.get_vfo()
+            vfo_value = self.server.rig.get_vfo()
+            logger.debug(f"{vfo_value=}")
+            return vfo_value
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -232,7 +235,7 @@ class CAT:
             http.client.ResponseNotReady,
         ) as exception:
             self.online = False
-            logger.debug("getvfo_flrig: %s", f"{exception}")
+            logger.debug(f"{exception=}")
         return ""
 
     def __getvfo_rigctld(self) -> str:
@@ -244,7 +247,7 @@ class CAT:
                 return self.__get_serial_string().strip()
             except socket.error as exception:
                 self.online = False
-                logger.debug("getvfo_rigctld: %s", f"{exception}")
+                logger.debug(f"{exception=}")
                 self.rigctrlsocket = None
             return ""
 
@@ -268,7 +271,9 @@ class CAT:
         # 7300 ['LSB', 'USB', 'AM', 'FM', 'CW', 'CW-R', 'RTTY', 'RTTY-R', 'LSB-D', 'USB-D', 'AM-D', 'FM-D']
         try:
             self.online = True
-            return self.server.rig.get_mode()
+            mode_value = self.server.rig.get_mode()
+            logger.debug(f"{mode_value=}")
+            return mode_value
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -282,7 +287,7 @@ class CAT:
 
     def __getmode_rigctld(self) -> str:
         """Returns mode vai rigctld"""
-        # QMX 'AM CW USB LSB RTTY FM CWR RTTYR'
+        # QMX 'DIGI-U DIGI-L CW-U CW-L' or 'LSB', 'USB', 'CW', 'FM', 'AM', 'FSK'
         # 7300 'AM CW USB LSB RTTY FM CWR RTTYR PKTLSB PKTUSB FM-D AM-D'
         if self.rigctrlsocket:
             try:
@@ -316,6 +321,7 @@ class CAT:
         try:
             self.online = True
             bandwidth = self.server.rig.get_bw()
+            logger.debug(f"{bandwidth=}")
             return bandwidth[0]
         except (
             ConnectionRefusedError,
@@ -438,7 +444,9 @@ class CAT:
         """Returns list of modes supported by the radio"""
         try:
             self.online = True
-            return self.server.rig.get_modes()
+            mode_list = self.server.rig.get_modes()
+            logger.debug(f"{mode_list=}")
+            return mode_list
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -529,7 +537,10 @@ class CAT:
         """Sets the radios mode"""
         try:
             self.online = True
-            return self.server.rig.set_mode(mode)
+            logger.debug(f"{mode=}")
+            set_mode_result = self.server.rig.set_mode(mode)
+            logger.debug(f"self.server.rig.setmode(mode) = {set_mode_result}")
+            return set_mode_result
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -538,7 +549,7 @@ class CAT:
             http.client.ResponseNotReady,
         ) as exception:
             self.online = False
-            logger.debug("setmode_flrig: %s", f"{exception}")
+            logger.debug(f"{exception=}")
         return False
 
     def __setmode_rigctld(self, mode: str) -> bool:

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.6"
+__version__ = "24.11.10"

not1mm/plugins/arrl_ss_cw.py

@@ -137,7 +137,6 @@ def prefill(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/arrl_vhf_jan.py

@@ -540,7 +540,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/arrl_vhf_jun.py

@@ -508,7 +508,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/arrl_vhf_sep.py

@@ -508,7 +508,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/cq_160_cw.py

@@ -453,7 +453,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         # if self.other_1.text() == "":

not1mm/plugins/cq_160_ssb.py

@@ -453,7 +453,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         # if self.other_1.text() == "":

not1mm/plugins/cq_ww_cw.py

@@ -523,7 +523,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/cq_ww_rtty.py

@@ -642,7 +642,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/cq_ww_ssb.py

@@ -511,7 +511,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/k1usn_sst.py

@@ -496,7 +496,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/naqp_cw.py

@@ -546,7 +546,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/naqp_rtty.py

@@ -653,7 +653,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/naqp_ssb.py

@@ -516,7 +516,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/raem.py

@@ -494,7 +494,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

not1mm/plugins/stew_perry_topband.py

@@ -369,7 +369,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/weekly_rtty.py

@@ -577,7 +577,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/plugins/winter_field_day.py

@@ -444,7 +444,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

not1mm/radio.py

@@ -35,7 +35,16 @@ class Radio(QObject):
     host = None
     port = None
     modes = ""
+    cw_list = ["CW", "CW-L", "CW-U", "CWR"]
+    rtty_list = [
+        "RTTY",
+        "DIGI-L",
+        "PKTLSB",
+        "LSB-D",
+    ]
     last_data_mode = "RTTY"
+    last_cw_mode = "CW"
+    last_ph_mode = "SSB"
 
     def __init__(self, interface: str, host: str, port: int) -> None:
         super().__init__()
@@ -49,6 +58,15 @@ class Radio(QObject):
             self.cat = CAT(self.interface, self.host, self.port)
             self.online = self.cat.online
             self.modes = self.cat.get_mode_list()
+            for pos_cw in self.cw_list:
+                if pos_cw in self.modes:
+                    self.last_cw_mode = pos_cw
+                    break
+            for pos_rtty in self.rtty_list:
+                if pos_rtty in self.modes:
+                    self.last_data_mode = pos_rtty
+                    break
+
         except ConnectionResetError:
             ...
         while not self.time_to_quit:
@@ -97,6 +115,7 @@ class Radio(QObject):
             "USB-D",
             "AM-D",
             "FM-D",
+            "FSK",
             "DIGI-U",
             "DIGI-L",
             "RTTYR",
@@ -106,6 +125,11 @@ class Radio(QObject):
         if the_mode in datamodes:
             self.last_data_mode = the_mode
 
+        cwmodes = ["CW", "CW-L", "CW-U", "CWR"]
+
+        if the_mode in cwmodes:
+            self.last_cw_mode = the_mode
+
     def sendcw(self, texttosend):
         """..."""
         logger.debug(f"Send CW: {texttosend}")

{not1mm-24.11.6.dist-info → not1mm-24.11.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.6
+Version: 24.11.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-10] ReJiggered CAT/flrig interface to hopefull make it more workable.
 - [24-11-6] Added Call history to ARRL VHF, CQ160, CQWW, StewPerry, Weekly RTTY
 - [24-11-5] Fix crash with bad qrz credentials.
 - [24-11-3-1] Fixed CWT ESM, Add Call History to CWT, Helvetia, WFD, NAQP, K1USN. Add ESM Helvetia.

{not1mm-24.11.6.dist-info → not1mm-24.11.10.dist-info}/RECORD

@@ -1,12 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=T0hdB2sKV_bRA293-WeRf9vloO3HDODI4o1TY5Pf47I,141356
+not1mm/__main__.py,sha256=HJWo2CMZpp2kgFSXQ9za-2PnX12Ih3Un18V3zy3U6_U,141893
 not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
 not1mm/checkwindow.py,sha256=F6hNCbVSLG2PPY2afgmwlBWeqr1Uj4-n__AivDLVQ_0,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
 not1mm/lookupservice.py,sha256=4c36x_1G3Sy69gQfJ6El7vHLIKTjLGH67ziPPoeYweM,2648
-not1mm/radio.py,sha256=eu1kBjmttREFZ5tAJpNuQSMrmWeKw4Tb-sjgjChUYUs,4693
-not1mm/test.py,sha256=o3DH2wQ3C_HwK650dBqNFf0eYCg5D6s8_GvJht1WjVo,1924
+not1mm/radio.py,sha256=khmyESHaXUDF2hGQ5v3atEOd1YACrOAsuoIA4XgNtlc,5340
 not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-ExtraLight.ttf,sha256=g5Hn7BPounWMGDj1a8zZcyKMz03HSqW__pUluRR7Evg,274144
@@ -95,7 +94,7 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
-not1mm/lib/cat_interface.py,sha256=Vkxq4JvWguP8O95JYUfQ5hrllzggm6jeFXFiTBKvnw8,22534
+not1mm/lib/cat_interface.py,sha256=b6Y5a0WHawjI5kOalVdqq5_P7rhBqGKXYFMptSzyHXI,22985
 not1mm/lib/cwinterface.py,sha256=3H_Ur5qtZCg6AA-CBURdnS3IUcvs3YAcwYLO0S8SUBg,3621
 not1mm/lib/database.py,sha256=nqWp2eJ7JfUTqaQ9AVbx3XjgtlRnYY9ruTQCv2YRreY,48310
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -110,12 +109,11 @@ not1mm/lib/lookup.py,sha256=KECMDi9tflRDzgTLeDfDl7HGWWRHvW3HCjNHyyjoWaY,10835
 not1mm/lib/multicast.py,sha256=KJcruI-bOuHfHXPjl3SGQhL6I9sKrygy-sdFSvxffUM,3255
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
-not1mm/lib/playsound.py,sha256=kxkcitBFbZCXJ2wxQ1lxg4rBwfxiSpuNpJSXHOPCoXA,9241
 not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9727
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=Xt0WE2ro_kUYdugQ0Pe1SQX07MHrJ0jyQqDqAKKqxuU,13564
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=KCXyExImS-3bja9rsBnV3HWDykHK-FHT3DF7HIjhb88,48
+not1mm/lib/version.py,sha256=PxG5vkFNHXk38yhcpyOZ-pzC4v3doKTwaaEUaUP4mZk,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=gNgTnafjM99cFvZ-6qBfWoOvd5Zj2Ehx6XjJvrHjm40,11872
 not1mm/plugins/10_10_spring_cw.py,sha256=QME8LyLyTnHsA5sjGG19n_64-0gdgBMRRi9C8LpgQzs,11877
@@ -127,20 +125,20 @@ not1mm/plugins/arrl_dx_cw.py,sha256=zAnVa3spbxjlDXMrV_RvvqyUAaYBZ6IZjxhsfLdc-9Q,
 not1mm/plugins/arrl_dx_ssb.py,sha256=Xxa9t2mu9IhY71jevvY95CMLXOBHBOGstNFWUwsVQkE,18017
 not1mm/plugins/arrl_field_day.py,sha256=N68dy5FhPCDYxTIP8PNQh4p5rZDJlHmhQqJyH6Qi4qo,16967
 not1mm/plugins/arrl_rtty_ru.py,sha256=hKUS4isjdXo3EYxQrsqsDupPp2chW8fpoWj0T1pTgJ4,7994
-not1mm/plugins/arrl_ss_cw.py,sha256=G1WT2_nF-IISHwteZYT0gJJ6vu_QqUE4hg8gm4tLxss,17596
+not1mm/plugins/arrl_ss_cw.py,sha256=JEr3fxpn-R0R70uBdpMpFBH-mdx7Vrt9e6UQuvR0X9I,17572
 not1mm/plugins/arrl_ss_phone.py,sha256=zIZidB3li8n7dxCsqGechkSmxjQM7TBHeLvSv2l5QdY,17246
-not1mm/plugins/arrl_vhf_jan.py,sha256=HZLqRUGX2aROnmVPfkspx9sd3GPPKdcVIQT1_TiX7Hk,16952
-not1mm/plugins/arrl_vhf_jun.py,sha256=XaqQ871dd8qF5OKnlgiiwWh7IDDbp1Lx65kfCLrFjmo,16044
-not1mm/plugins/arrl_vhf_sep.py,sha256=PF6kvOUnnW7B43cONYYa-Te1s1PKK8hNeZ_lovGvrNw,16044
+not1mm/plugins/arrl_vhf_jan.py,sha256=LE1X0G9m6YrgUMB3CV12lxkh1bf9QiRU-gMi51NFtLs,16928
+not1mm/plugins/arrl_vhf_jun.py,sha256=RlQLXWASs6mNUhVnvlUp35N5bGYbQGaDJj8UJantSok,16020
+not1mm/plugins/arrl_vhf_sep.py,sha256=xIUgHIXMZ0euMCaTr2Ftk3U5yu4cFxP2YOeQvLUnGgE,16020
 not1mm/plugins/canada_day.py,sha256=kFwrJ6T9Zz34KmaWL88bj8MDSYNpO2q_KNWLkLLZKlI,15993
-not1mm/plugins/cq_160_cw.py,sha256=QoUtKX2HM4Iq3u-3Za4go9oSrptxSWAezb9a9tg4dsk,15803
-not1mm/plugins/cq_160_ssb.py,sha256=vyZ6g_mEOVsPmEl5pVcDUk-Y32k7xrB_4R4SxGwuP1A,15846
+not1mm/plugins/cq_160_cw.py,sha256=axx9oFhJ3SgfuMC3nmSId0_xUcldKK1Jxq2Rew7em-M,15779
+not1mm/plugins/cq_160_ssb.py,sha256=SE2caAhJ_VdlONEMcamEFebAzybRGX98koW8LaWG0vY,15822
 not1mm/plugins/cq_wpx_cw.py,sha256=g_d7i1DrQjAeGuof6SoKAr9HkR9ru3EBEKxLSBjNF4o,18508
 not1mm/plugins/cq_wpx_rtty.py,sha256=t5ZAWAtsjda6rAHJ2N2mfenazhsSo2yzqRGV-TKZEbA,21327
 not1mm/plugins/cq_wpx_ssb.py,sha256=f7cCyheb7VqkDMrM-wevcOCUXjrIXyBI0p2ynVYnDO0,17158
-not1mm/plugins/cq_ww_cw.py,sha256=h7JJSeEVMwgyY7uU8Wz2pHeHmKyJxRjPl8kmLfMupDE,17724
-not1mm/plugins/cq_ww_rtty.py,sha256=30WtyazZFqFnGsT51Dhh6kAH07HAN-FvuoLny6W--zQ,22359
-not1mm/plugins/cq_ww_ssb.py,sha256=5MlMnvVfkCW3ER-K2WwYMT_EK2icPuTq1h0RtlTHe5E,17323
+not1mm/plugins/cq_ww_cw.py,sha256=1sxwrvHGbzErQSXFSWw7wpg6DEKXrjHfE7SK2noCcjE,17700
+not1mm/plugins/cq_ww_rtty.py,sha256=DaofxRXnbt095FJ-uZ4B_Wx6P12mdO6c_nQFhpMp0RU,22335
+not1mm/plugins/cq_ww_ssb.py,sha256=QKOTw842eF9a4WiNZB-f16YE4zm2mIc0JxmU46URXUk,17299
 not1mm/plugins/cwt.py,sha256=duG8CgTWaFCjly7zOmhOJo-sH3amby0OarAjswhz1Cc,17370
 not1mm/plugins/general_logging.py,sha256=IHcgZ1YJEEaxPUn7jyTIUpQAsa1jaHO5zfHvcaqbF34,3494
 not1mm/plugins/helvetia.py,sha256=Q-dQgJ5-81jwip0J_JE2XdUtkY1dVlD8bPfVbllwGLU,19925
@@ -150,20 +148,20 @@ not1mm/plugins/iaru_hf.py,sha256=Lg1rNWcLKDXR_AAFoMs-velZxNMTO_7kiJeT-j0A2wo,124
 not1mm/plugins/icwc_mst.py,sha256=N41Qg1sGAGkjx87uWUE77U-VvJmNXkCR_WfKdKg5nSk,12750
 not1mm/plugins/jidx_cw.py,sha256=Mw5U25jxXJiHx8YEBXz6VPVVQ7rQb9LREYic6hVaMs0,13043
 not1mm/plugins/jidx_ph.py,sha256=qhF_NQzx2RiM23CY9qPd4Vg_zFmnzSivvPXv4HpPLBY,12073
-not1mm/plugins/k1usn_sst.py,sha256=P0HxQe_E38-jycpC17QuvzymkHG3Y8XkFkSSf3udRT0,16705
-not1mm/plugins/naqp_cw.py,sha256=_51kobPyfxEuL7wU3sG42g0gqRW9hP5r09wM9DzHvJM,18630
-not1mm/plugins/naqp_rtty.py,sha256=wMWoHW0VwydkrnKc6vSTazXTKf1iFsbLqeVhR8rtuts,22314
-not1mm/plugins/naqp_ssb.py,sha256=ZAhpJtcmlTqZ-BGDS1jIirG64KWqG5TpvXeYZisawnE,17547
+not1mm/plugins/k1usn_sst.py,sha256=Z7r8Bz2vsWKbA4MNVoXdfdH3oSOvuftoWY2_X_hDJWc,16681
+not1mm/plugins/naqp_cw.py,sha256=mV32k78KE07YlyALW26y-TAITkVwDOn1gEoMrHj-7Qs,18606
+not1mm/plugins/naqp_rtty.py,sha256=P70eIvjZHMNTjYcZZ8IOXPXtNzGmLWJdYxwOqnzCThg,22290
+not1mm/plugins/naqp_ssb.py,sha256=6DbOUsbKMxDHw8m1OcyqtjVUL3qqZ2A5bqQPjYbbJ6M,17523
 not1mm/plugins/phone_weekly_test.py,sha256=q0n8RJ39KF9uzkgTwrRqTlnS1l_xpm86UTsYRtD6Qok,13244
-not1mm/plugins/raem.py,sha256=yCpBRFmDZ3W4o3e2LUCgBHCGDSHtpsTCmlgWpdZPAw0,19474
+not1mm/plugins/raem.py,sha256=7CSTaMqINB3QVxzqWRZxpxuoXQoCx10J_V49GyXAHWI,19450
 not1mm/plugins/ref_cw.py,sha256=bLu1BIHnMfJJAw-pcLDVSi93vTMBY8Io1I4SkJSRX0E,20916
 not1mm/plugins/ref_ssb.py,sha256=Z6ZqNInyGFwWNSHXrzCDlokMxZ6NQQ2Yi1c8CGfmNWE,20922
-not1mm/plugins/stew_perry_topband.py,sha256=Q0yPpX-0Ua1dn4II-wkC-nezffJmi5aLK3aN6MkZyfw,11903
-not1mm/plugins/weekly_rtty.py,sha256=BRunxOiI_itSFjq6g442QmmP-KUjjis6jpIi7CKExIM,19520
-not1mm/plugins/winter_field_day.py,sha256=B3HkoInwV7sJLnUUso9nQvU1nZAtNTAeXZV5H5Yl-2Y,14915
-not1mm-24.11.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.11.6.dist-info/METADATA,sha256=ePkUxibsgwdZbtetkk6ocxFVRVq_xrPOP6cdV2kKjBc,34175
-not1mm-24.11.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-not1mm-24.11.6.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.11.6.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.11.6.dist-info/RECORD,,
+not1mm/plugins/stew_perry_topband.py,sha256=DXbJYLJ7JpPotdvax74d2YOX5HaMUc-Fk1XvBXMhl9I,11879
+not1mm/plugins/weekly_rtty.py,sha256=OLiLW3Xd-tylSy9onOXCxQwWfijx-O5PAgjHh7_vG1o,19496
+not1mm/plugins/winter_field_day.py,sha256=E4Rn7bOpN2LNoRi4_aRDHd_8p5lxn1vG_ubGdzn5zB0,14891
+not1mm-24.11.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.11.10.dist-info/METADATA,sha256=u5BKaU2XxtTzamvJpT3z_11UKrrxzOPENF_f4-0sTXs,34255
+not1mm-24.11.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+not1mm-24.11.10.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.11.10.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.11.10.dist-info/RECORD,,

not1mm/lib/playsound.py

@@ -1,296 +0,0 @@
-import logging
-from platform import system
-
-logger = logging.getLogger(__name__)
-
-
-class PlaysoundException(Exception):
-    pass
-
-
-def _canonicalizePath(path):
-    """
-    Support passing in a pathlib.Path-like object by converting to str.
-    """
-    import sys
-
-    if sys.version_info[0] >= 3:
-        return str(path)
-    else:
-        # On earlier Python versions, str is a byte string, so attempting to
-        # convert a unicode string to str will fail. Leave it alone in this case.
-        return path
-
-
-def _playsoundWin(sound, block=True):
-    """
-    Utilizes windll.winmm. Tested and known to work with MP3 and WAVE on
-    Windows 7 with Python 2.7. Probably works with more file formats.
-    Probably works on Windows XP thru Windows 10. Probably works with all
-    versions of Python.
-
-    Inspired by (but not copied from) Michael Gundlach <gundlach@gmail.com>'s mp3play:
-    https://github.com/michaelgundlach/mp3play
-
-    I never would have tried using windll.winmm without seeing his code.
-    """
-    sound = '"' + _canonicalizePath(sound) + '"'
-
-    from ctypes import create_unicode_buffer, windll, wintypes
-
-    windll.winmm.mciSendStringW.argtypes = [
-        wintypes.LPCWSTR,
-        wintypes.LPWSTR,
-        wintypes.UINT,
-        wintypes.HANDLE,
-    ]
-    windll.winmm.mciGetErrorStringW.argtypes = [
-        wintypes.DWORD,
-        wintypes.LPWSTR,
-        wintypes.UINT,
-    ]
-
-    def winCommand(*command):
-        bufLen = 600
-        buf = create_unicode_buffer(bufLen)
-        command = " ".join(command)
-        errorCode = int(
-            windll.winmm.mciSendStringW(command, buf, bufLen - 1, 0)
-        )  # use widestring version of the function
-        if errorCode:
-            errorBuffer = create_unicode_buffer(bufLen)
-            windll.winmm.mciGetErrorStringW(
-                errorCode, errorBuffer, bufLen - 1
-            )  # use widestring version of the function
-            exceptionMessage = (
-                "\n    Error " + str(errorCode) + " for command:"
-                "\n        " + command + "\n    " + errorBuffer.value
-            )
-            logger.error(exceptionMessage)
-            raise PlaysoundException(exceptionMessage)
-        return buf.value
-
-    try:
-        logger.debug("Starting")
-        winCommand("open {}".format(sound))
-        winCommand("play {}{}".format(sound, " wait" if block else ""))
-        logger.debug("Returning")
-    finally:
-        try:
-            winCommand("close {}".format(sound))
-        except PlaysoundException:
-            logger.warning("Failed to close the file: {}".format(sound))
-            # If it fails, there's nothing more that can be done...
-            pass
-
-
-def _handlePathOSX(sound):
-    sound = _canonicalizePath(sound)
-
-    if "://" not in sound:
-        if not sound.startswith("/"):
-            from os import getcwd
-
-            sound = getcwd() + "/" + sound
-        sound = "file://" + sound
-
-    try:
-        # Don't double-encode it.
-        sound.encode("ascii")
-        return sound.replace(" ", "%20")
-    except UnicodeEncodeError:
-        try:
-            from urllib.parse import quote  # Try the Python 3 import first...
-        except ImportError:
-            from urllib import (
-                quote,
-            )  # Try using the Python 2 import before giving up entirely...
-
-        parts = sound.split("://", 1)
-        return parts[0] + "://" + quote(parts[1].encode("utf-8")).replace(" ", "%20")
-
-
-def _playsoundOSX(sound, block=True):
-    """
-    Utilizes AppKit.NSSound. Tested and known to work with MP3 and WAVE on
-    OS X 10.11 with Python 2.7. Probably works with anything QuickTime supports.
-    Probably works on OS X 10.5 and newer. Probably works with all versions of
-    Python.
-
-    Inspired by (but not copied from) Aaron's Stack Overflow answer here:
-    http://stackoverflow.com/a/34568298/901641
-
-    I never would have tried using AppKit.NSSound without seeing his code.
-    """
-    try:
-        from AppKit import NSSound
-    except ImportError:
-        logger.warning(
-            "playsound could not find a copy of AppKit - falling back to using macOS's system copy."
-        )
-        sys.path.append(
-            "/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/PyObjC"
-        )
-        from AppKit import NSSound
-
-    from Foundation import NSURL
-    from time import sleep
-
-    sound = _handlePathOSX(sound)
-    url = NSURL.URLWithString_(sound)
-    if not url:
-        raise PlaysoundException("Cannot find a sound with filename: " + sound)
-
-    for i in range(5):
-        nssound = NSSound.alloc().initWithContentsOfURL_byReference_(url, True)
-        if nssound:
-            break
-        else:
-            logger.debug("Failed to load sound, although url was good... " + sound)
-    else:
-        raise PlaysoundException(
-            "Could not load sound with filename, although URL was good... " + sound
-        )
-    nssound.play()
-
-    if block:
-        sleep(nssound.duration())
-
-
-def _playsoundNix(sound, block=True):
-    """Play a sound using GStreamer.
-
-    Inspired by this:
-    https://gstreamer.freedesktop.org/documentation/tutorials/playback/playbin-usage.html
-    """
-    sound = _canonicalizePath(sound)
-
-    # pathname2url escapes non-URL-safe characters
-    from os.path import abspath, exists
-
-    try:
-        from urllib.request import pathname2url
-    except ImportError:
-        # python 2
-        from urllib import pathname2url
-
-    import gi
-
-    gi.require_version("Gst", "1.0")
-    from gi.repository import Gst
-
-    Gst.init(None)
-
-    playbin = Gst.ElementFactory.make("playbin", "playbin")
-    if sound.startswith(("http://", "https://")):
-        playbin.props.uri = sound
-    else:
-        path = abspath(sound)
-        if not exists(path):
-            raise PlaysoundException("File not found: {}".format(path))
-        playbin.props.uri = "file://" + pathname2url(path)
-
-    set_result = playbin.set_state(Gst.State.PLAYING)
-    if set_result != Gst.StateChangeReturn.ASYNC:
-        raise PlaysoundException("playbin.set_state returned " + repr(set_result))
-
-    # FIXME: use some other bus method than poll() with block=False
-    # https://lazka.github.io/pgi-docs/#Gst-1.0/classes/Bus.html
-    logger.debug("Starting play")
-    if block:
-        bus = playbin.get_bus()
-        try:
-            bus.poll(Gst.MessageType.EOS, Gst.CLOCK_TIME_NONE)
-        finally:
-            playbin.set_state(Gst.State.NULL)
-
-    logger.debug("Finishing play")
-
-
-def _playsoundAnotherPython(otherPython, sound, block=True, macOS=False):
-    """
-    Mostly written so that when this is run on python3 on macOS, it can invoke
-    python2 on macOS... but maybe this idea could be useful on linux, too.
-    """
-    from inspect import getsourcefile
-    from os.path import abspath, exists
-    from subprocess import check_call
-    from threading import Thread
-
-    sound = _canonicalizePath(sound)
-
-    class PropogatingThread(Thread):
-        def run(self):
-            self.exc = None
-            try:
-                self.ret = self._target(*self._args, **self._kwargs)
-            except BaseException as e:
-                self.exc = e
-
-        def join(self, timeout=None):
-            super().join(timeout)
-            if self.exc:
-                raise self.exc
-            return self.ret
-
-    # Check if the file exists...
-    if not exists(abspath(sound)):
-        raise PlaysoundException("Cannot find a sound with filename: " + sound)
-
-    playsoundPath = abspath(getsourcefile(lambda: 0))
-    t = PropogatingThread(
-        target=lambda: check_call(
-            [otherPython, playsoundPath, _handlePathOSX(sound) if macOS else sound]
-        )
-    )
-    t.start()
-    if block:
-        t.join()
-
-
-system = system()
-
-if system == "Windows":
-    playsound = _playsoundWin
-elif system == "Darwin":
-    playsound = _playsoundOSX
-    import sys
-
-    if sys.version_info[0] > 2:
-        try:
-            from AppKit import NSSound
-        except ImportError:
-            logger.warning(
-                "playsound is relying on a python 2 subprocess. Please use `pip3 install PyObjC` if you want playsound to run more efficiently."
-            )
-            playsound = lambda sound, block=True: _playsoundAnotherPython(
-                "/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python",
-                sound,
-                block,
-                macOS=True,
-            )
-else:
-    playsound = _playsoundNix
-    if (
-        __name__ != "__main__"
-    ):  # Ensure we don't infinitely recurse trying to get another python instance.
-        try:
-            import gi
-
-            gi.require_version("Gst", "1.0")
-            from gi.repository import Gst
-        except:
-            logger.warning(
-                "playsound is relying on another python subprocess. Please use `pip install pygobject` if you want playsound to run more efficiently."
-            )
-            playsound = lambda sound, block=True: _playsoundAnotherPython(
-                "/usr/bin/python3", sound, block, macOS=False
-            )
-
-del system
-
-if __name__ == "__main__":
-    # block is always True if you choose to run this from the command line.
-    from sys import argv
-
-    playsound(argv[1])

not1mm/test.py

@@ -1,61 +0,0 @@
-from not1mm.lib.database import DataBase
-from json import loads
-import not1mm.fsutils as fsutils
-import os
-
-dbname = None
-pref = {}
-
-
-def load_pref():
-    try:
-        if os.path.exists(fsutils.CONFIG_FILE):
-            with open(fsutils.CONFIG_FILE, "rt", encoding="utf-8") as file_descriptor:
-                pref = loads(file_descriptor.read())
-        else:
-            pref["current_database"] = "ham.db"
-
-    except IOError:
-        ...
-
-
-load_pref()
-dbname = fsutils.USER_DATA_PATH / pref.get("current_database", "ham.db")
-database = DataBase(dbname, fsutils.USER_DATA_PATH)
-
-database.create_callhistory_table()
-database.delete_callhistory()
-
-try:
-    with open(
-        "/home/mbridak/call_history/CWOPS_3634-AAA.txt", "rt", encoding="utf-8"
-    ) as file_descriptor:
-        lines = file_descriptor.readlines()
-        if "!!Order!!" in lines[0]:
-            item_names = lines[0].strip().split(",")
-            # ['!!Order!!', 'Call', 'Sect', 'State', 'CK', 'UserText', '']
-            item_names = item_names[1:-1]
-            # ['Call', 'Sect', 'State', 'CK', 'UserText']
-            lines = lines[1:]
-            group_list = []
-            for line in lines:
-                if line.startswith("#"):
-                    continue
-                group = {}
-                fields = line.strip().split(",")
-                # ['4U1WB','MDC','DC','89','']
-                count = 0
-                try:
-                    for item in item_names:
-                        if item == "":
-                            continue
-                        group[item] = fields[count]
-                        count += 1
-                    group_list.append(group)
-                    # database.add_callhistory_item(group)
-                    # print(f"{group=}")
-                except IndexError:
-                    ...
-            database.add_callhistory_items(group_list)
-except FileNotFoundError:
-    print("error")