not1mm 24.12.11.1__py3-none-any.whl → 24.12.14__py3-none-any.whl

not1mm/__main__.py

@@ -33,7 +33,7 @@ except OSError as exception:
     print(exception)
     print("portaudio is not installed")
     sd = None
-from PyQt6 import QtCore, QtGui, QtWidgets, uic
+from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
 from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
 from PyQt6.QtWidgets import QFileDialog, QSplashScreen, QApplication
@@ -66,7 +66,6 @@ from not1mm.lib.settings import Settings
 from not1mm.lib.version import __version__
 from not1mm.lib.versiontest import VersionTest
 from not1mm.lib.ft8_watcher import FT8Watcher
-from not1mm.lib.fldigi_watcher import FlDigiWatcher
 from not1mm.lib.fldigi_sendstring import FlDigi_Comm
 
 import not1mm.fsutils as fsutils
@@ -174,10 +173,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
     radio_thread = QThread()
     voice_thread = QThread()
-    fldigi_thread = QThread()
     rtc_thread = QThread()
 
-    fldigi_watcher = None
     rig_control = None
     log_window = None
     check_window = None
@@ -668,14 +665,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Reading macros.")
         self.read_macros()
 
-        self.show_splash_msg("Starting FlDigi watcher.")
-        self.fldigi_watcher = FlDigiWatcher()
-        self.fldigi_watcher.moveToThread(self.fldigi_thread)
-        self.fldigi_thread.started.connect(self.fldigi_watcher.run)
-        self.fldigi_thread.finished.connect(self.fldigi_watcher.deleteLater)
-        self.fldigi_watcher.poll_callback.connect(self.fldigi_qso)
-        self.fldigi_thread.start()
-
         self.show_splash_msg("Restoring window states.")
         self.settings = QSettings("K6GTE", "not1mm")
         if self.settings.value("windowState") is not None:
@@ -718,6 +707,20 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+        self.udp_socket = QtNetwork.QUdpSocket()
+        b_result = self.udp_socket.bind(
+            QtNetwork.QHostAddress.SpecialAddress.AnyIPv4, 9876
+        )
+        logger.info(f"bind {b_result}")
+        self.udp_socket.readyRead.connect(self.fldigi_on_udp_socket_ready_read)
+
+    def fldigi_on_udp_socket_ready_read(self):
+        """"""
+        datagram, sender_host, sender_port_number = self.udp_socket.readDatagram(
+            self.udp_socket.pendingDatagramSize()
+        )
+        self.fldigi_qso(datagram.decode())
+
     def load_call_history(self) -> None:
         """Display filepicker and load chosen call history file."""
         filename = self.filepicker("other")

not1mm/lib/cat_interface.py

@@ -122,7 +122,7 @@ class CAT:
     def __initialize_rigctrld(self):
         try:
             self.rigctrlsocket = socket.socket()
-            self.rigctrlsocket.settimeout(0.2)
+            self.rigctrlsocket.settimeout(0.5)
             self.rigctrlsocket.connect((self.host, self.port))
             logger.debug("Connected to rigctrld")
             self.online = True
@@ -146,12 +146,14 @@ class CAT:
         """Gets any serial data waiting"""
         dump = ""
         thegrab = ""
+        self.rigctrlsocket.settimeout(0.1)
         try:
             while True:
                 thegrab += self.rigctrlsocket.recv(1024).decode()
                 dump += thegrab
-        except socket.error:
+        except (socket.error, UnicodeDecodeError):
             ...
+        self.rigctrlsocket.settimeout(0.5)
         return dump
 
     def sendcw(self, texttosend):

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.11.1"
+__version__ = "24.12.14"

{not1mm-24.12.11.1.dist-info → not1mm-24.12.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.11.1
+Version: 24.12.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -239,6 +239,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-14] Changed method of detecting fldigi QSOs. See docs.
+- [24-12-12] Add a try exception for a unicode decode error.
 - [24-12-11-1] Add RTC to RAC Canada Day, ARRL VHF, ARRL Field Day, ARRL SS, ARRL DX, 10 10
 - [24-12-11] Add RTC to IARU HF, IARU Field Day, DARC XMAS, CQ WW, CQ WPX
 - [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
@@ -637,9 +639,13 @@ On the Options TAB you can:
 not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
 No setup is needed to be done on not1mm's side. That's good because I'm lazy.
 
-not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather stupid
+~~not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather stupid
 way. It just keeps asking what was the last QSO and compares it to the previous response.
-If it's different, it's new.
+If it's different, it's new.~~
+
+not1mm watches for fldigi qso's by watching for UDP traffic from fldigi on 127.0.0.1:9876.
+
+![fldigi configuration dialog](https://github.com/mbridak/not1mm/blob/master/pic/fldigi_adif_udp.png?raw=true)
 
 The F1-F12 function keys be sent to fldigi via XMLRPC. Fldigi will be placed into TX
 mode, the message will be sent and a ^r will be tacked onto the end to place it back into

{not1mm-24.12.11.1.dist-info → not1mm-24.12.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=wwuwQHChnYEWWMkiE5XsudVb52VodXSSMkKdXdWY2JU,144688
+not1mm/__main__.py,sha256=bThSgJVaz1ae0Y-ayJpuYn8NvAPiBXOTvy-PctnLkg4,144712
 not1mm/bandmap.py,sha256=zD3aUf36NVQCy0plAcZLNxYhSEM9xZ8J1Cu9vrcFPYA,31136
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -96,7 +96,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=0R9ZiEZ0u0RzPrw_hrFNIdS4ybUBgAKtD74x2jdCVIU,25094
+not1mm/lib/cat_interface.py,sha256=weOH3Gds2ISEdZ2uZkHOv5tBZu-hoSwYKlrFUlg_KK4,25202
 not1mm/lib/cwinterface.py,sha256=yQL8Dif9oOIynaRItHgvcmu4mYv1TnTpqCHPtkeb09o,4472
 not1mm/lib/database.py,sha256=mm3vJgKmAQcUn4Ej--feR0yc_RhWTN01JIwMelI1EdI,48971
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -104,7 +104,6 @@ not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
 not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,1965
 not1mm/lib/fldigi_sendstring.py,sha256=EeXSBRKgyUEzNyHBjMtHiFe-iOU3TcWcCCX77t0ur_I,602
-not1mm/lib/fldigi_watcher.py,sha256=reZz3fZLDoJVVZhJD9nIssk2aczCzadDSQTVu-5mTCM,919
 not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
 not1mm/lib/ham_utility.py,sha256=WMmYLDI_fJHHsn0wkpGVit2Hv8fo6r9ybexXROia8Cg,11967
 not1mm/lib/lookup.py,sha256=KECMDi9tflRDzgTLeDfDl7HGWWRHvW3HCjNHyyjoWaY,10835
@@ -115,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=-cvXtEAUgZ7GtxaNiwVdHbZ-7wEBeoMPRZXNdCxnPyA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=j5lIMLHJ-eqIaVr_QhI82gkbOl17_C-5suRkWbHYET8,14717
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=EaaO76hhYOzheZe2yYhIbnhLOsBZ5g20OOXN_3kiB6A,51
+not1mm/lib/version.py,sha256=DDYJZfbw95B2hyfICy7lNMJfrh774wLa8A8CrBkeWpg,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -164,9 +163,9 @@ not1mm/plugins/ref_ssb.py,sha256=vfS9-mcnbw2znRvU4jh20JqI9BXap8jV65OV5mbCkCk,209
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=huZszbZsIh4vF3cP80UyPzy3qxIoHdEiT1b6KuvwgYc,20083
 not1mm/plugins/winter_field_day.py,sha256=cSCFwy1LOoDDA9Zs1LHRG3r8spDMSKDisxyPxnVrLjw,15149
-not1mm-24.12.11.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.12.11.1.dist-info/METADATA,sha256=4v4v9i_hZUKUDdonATSSte33Xx03ONaCaU-WX3bJzPs,36109
-not1mm-24.12.11.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.12.11.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.12.11.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.12.11.1.dist-info/RECORD,,
+not1mm-24.12.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.12.14.dist-info/METADATA,sha256=2p57a8FUbeXcEWuyk1vSjfDHqXntbNL02NdZkVT73-8,36440
+not1mm-24.12.14.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.12.14.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.12.14.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.12.14.dist-info/RECORD,,

not1mm/lib/fldigi_watcher.py

@@ -1,33 +0,0 @@
-import xmlrpc.client
-from PyQt6.QtCore import QObject, pyqtSignal, QThread, QEventLoop
-
-
-class FlDigiWatcher(QObject):
-    """fldigi watcher"""
-
-    poll_callback = pyqtSignal(str)
-    time_to_quit = False
-
-    def __init__(self):
-        super().__init__()
-        ...
-
-        self.target = "http://127.0.0.1:7362"
-        self.payload = ""
-        self.response = ""
-
-    def run(self):
-        while not self.time_to_quit:
-            try:
-                server = xmlrpc.client.ServerProxy(self.target)
-                self.response = server.logbook.last_record()
-            except OSError:
-                QThread.msleep(100)
-                continue
-            if self.payload != self.response:
-                self.payload = self.response
-                try:
-                    self.poll_callback.emit(self.payload)
-                except QEventLoop:
-                    ...
-            QThread.msleep(100)