not1mm 23.9.3.1__tar.gz → 23.10.31__tar.gz

{not1mm-23.9.3.1 → not1mm-23.10.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.9.3.1
+Version: 23.10.31
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -16,9 +16,20 @@ Classifier: Topic :: Communications :: Ham Radio
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: PyQt5
+Requires-Dist: requests
+Requires-Dist: dicttoxml
+Requires-Dist: xmltodict
+Requires-Dist: psutil
+Requires-Dist: sounddevice
+Requires-Dist: soundfile
+Requires-Dist: numpy
+Requires-Dist: notctyparser>=23.6.21
 
 # Not1MM
 
+The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
+
 [![PyPI](https://img.shields.io/pypi/v/not1mm)](https://pypi.org/project/not1mm/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Python: 3.10+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
@@ -143,6 +154,9 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-10-31] Fix crash if flrig wasn't running. Add CAT status icon.
+- [23-10-28] Merged PR from #qsantos and #bseidenberg, fixing crash related to zombie processes.
+- [23-10-22] Where've I been? Sorry, I've been caring for a family member. Be back soon.
 - [23-9-3] Added some accessibility stuff for screen readers. Fixed crash when entering invalid frequency in log window. You can now edit cells in the focused half of the log window.
 - [23-9-2] CTRL+SHIFT+K to open CW text entry field.
 
@@ -332,7 +346,7 @@ Choose the sound output device for the voice keyer.
 
 ### CAT
 
-Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really?
+Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really? There's an onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 ### CW Keyer interface
 
@@ -492,11 +506,15 @@ Click on `File` > `Generate Cabrillo`
 
 The file will be placed in your home directory. The name will be in the format of:
 
-`StationCall`_`ContestName`.log
+`StationCall`\_`ContestName`\_`CurrentDate`\_`CurrentTime`.log
+
+So for me it would look like:
+
+K6GTE_CANADA-DAY_2023-09-04_07-47-05.log
 
-So for me it would be:
+Look a log [eh](https://www.youtube.com/watch?v=El41sHXck-E)?.
 
-K6GTE_CQ-WPX-SSB.log
+[This](https://www.youtube.com/watch?v=oMI23JJUpGE) outlines some differences between ARRL Field Day and Canada Day.
 
 ## ADIF
 
@@ -504,7 +522,7 @@ K6GTE_CQ-WPX-SSB.log
 
 Boom... ADIF
 
-`StationCall`_`ContestName`.adi
+`StationCall`\_`ContestName`\_`Date`\_`Time`.adi
 
 ## Dupe checking
 

{not1mm-23.9.3.1 → not1mm-23.10.31}/README.md

@@ -1,5 +1,7 @@
 # Not1MM
 
+The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
+
 [![PyPI](https://img.shields.io/pypi/v/not1mm)](https://pypi.org/project/not1mm/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Python: 3.10+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
@@ -124,6 +126,9 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-10-31] Fix crash if flrig wasn't running. Add CAT status icon.
+- [23-10-28] Merged PR from #qsantos and #bseidenberg, fixing crash related to zombie processes.
+- [23-10-22] Where've I been? Sorry, I've been caring for a family member. Be back soon.
 - [23-9-3] Added some accessibility stuff for screen readers. Fixed crash when entering invalid frequency in log window. You can now edit cells in the focused half of the log window.
 - [23-9-2] CTRL+SHIFT+K to open CW text entry field.
 
@@ -313,7 +318,7 @@ Choose the sound output device for the voice keyer.
 
 ### CAT
 
-Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really?
+Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really? There's an onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 ### CW Keyer interface
 
@@ -473,11 +478,15 @@ Click on `File` > `Generate Cabrillo`
 
 The file will be placed in your home directory. The name will be in the format of:
 
-`StationCall`_`ContestName`.log
+`StationCall`\_`ContestName`\_`CurrentDate`\_`CurrentTime`.log
+
+So for me it would look like:
+
+K6GTE_CANADA-DAY_2023-09-04_07-47-05.log
 
-So for me it would be:
+Look a log [eh](https://www.youtube.com/watch?v=El41sHXck-E)?.
 
-K6GTE_CQ-WPX-SSB.log
+[This](https://www.youtube.com/watch?v=oMI23JJUpGE) outlines some differences between ARRL Field Day and Canada Day.
 
 ## ADIF
 
@@ -485,7 +494,7 @@ K6GTE_CQ-WPX-SSB.log
 
 Boom... ADIF
 
-`StationCall`_`ContestName`.adi
+`StationCall`\_`ContestName`\_`Date`\_`Time`.adi
 
 ## Dupe checking
 

{not1mm-23.9.3.1 → not1mm-23.10.31}/not1mm/__main__.py

@@ -101,9 +101,12 @@ def check_process(name: str) -> bool:
     Bool
     """
     for proc in psutil.process_iter():
-        if len(proc.cmdline()) == 2:
-            if name in proc.cmdline()[1]:
-                return True
+        try:
+            if len(proc.cmdline()) == 2:
+                if name in proc.cmdline()[1]:
+                    return True
+        except (psutil.NoSuchProcess, psutil.ZombieProcess):
+            continue
     return False
 
 
@@ -257,6 +260,11 @@ class MainWindow(QtWidgets.QMainWindow):
         self.leftdot.setPixmap(self.greendot)
         self.rightdot.setPixmap(self.reddot)
 
+        self.radio_grey = QtGui.QPixmap(icon_path + "radio_grey.png")
+        self.radio_red = QtGui.QPixmap(icon_path + "radio_red.png")
+        self.radio_green = QtGui.QPixmap(icon_path + "radio_green.png")
+        self.radio_icon.setPixmap(self.radio_grey)
+
         self.F1.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.F1.customContextMenuRequested.connect(self.edit_F1)
         self.F1.clicked.connect(self.sendf1)
@@ -373,6 +381,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 "You can udate to the current version by using:\npip install -U not1mm"
             )
 
+    def set_radio_icon(self, state: int) -> None:
+        """change CAT icon state"""
+        displaystate = [self.radio_grey, self.radio_red, self.radio_green]
+        try:
+            self.radio_icon.setPixmap(displaystate[state])
+        except (IndexError, TypeError) as err:
+            logger.debug(err)
+
     def toggle_cw_entry(self) -> None:
         """Toggle the CW entry field on and off."""
         self.cw_entry_visible = not self.cw_entry_visible
@@ -837,15 +853,7 @@ class MainWindow(QtWidgets.QMainWindow):
         try:
             cty = notctyparser.BigCty(WORKING_PATH + "/data/cty.json")
             update_available = cty.check_update()
-        except AttributeError as the_error:
-            logger.debug("cty parser returned an error: %s", the_error)
-            return
-        except ValueError as the_error:
-            print("cty parser returned an error: %s", the_error)
-            logger.debug("cty parser returned an error: %s", the_error)
-            return
-        except locale.Error as the_error:
-            print("cty parser returned an error: %s", the_error)
+        except (AttributeError, ValueError, locale.Error) as the_error:
             logger.debug("cty parser returned an error: %s", the_error)
             return
         logger.debug("Newer cty file available %s", str(update_available))
@@ -1879,6 +1887,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
+
         if self.pref.get("userigctld", False):
             logger.debug(
                 "Using rigctld: %s",
@@ -2320,10 +2329,13 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def poll_radio(self) -> None:
         """stub"""
+        self.set_radio_icon(0)
         if self.rig_control:
             if self.rig_control.online is False:
+                self.set_radio_icon(1)
                 self.rig_control.reinit()
             if self.rig_control.online:
+                self.set_radio_icon(2)
                 info_dirty = False
                 vfo = self.rig_control.get_vfo()
                 mode = self.rig_control.get_mode()

{not1mm-23.9.3.1 → not1mm-23.10.31}/not1mm/bandmap.py

@@ -737,7 +737,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.send_command("set dx extension Name CTY State Section")
             self.send_command("set dx mode " + PREF.get("cluster_mode", "OPEN"))
             return
-        if "call:" in data:
+        if "call:" in data or "callsign:" in data:
             self.send_command(self.callsignField.text())
             self.send_command(PREF.get("cluster_filter", ""))
             self.send_command("set dx extension Name CTY State Section")