not1mm 23.9.3.1__py3-none-any.whl → 23.10.31__py3-none-any.whl

not1mm/data/main.ui

@@ -597,6 +597,16 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QLabel" name="radio_icon">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QRadioButton" name="radioButton_run">
               <property name="focusPolicy">
@@ -1089,7 +1099,7 @@
      <x>0</x>
      <y>0</y>
      <width>866</width>
-     <height>30</height>
+     <height>25</height>
     </rect>
    </property>
    <property name="nativeMenuBar">

not1mm/lib/cat_interface.py

@@ -7,6 +7,7 @@ GPL V3
 import logging
 import socket
 import xmlrpc.client
+import http
 
 if __name__ == "__main__":
     print("I'm not the program you are looking for.")
@@ -63,9 +64,11 @@ class CAT:
             self.online = True
             try:
                 _ = self.server.main.get_version()
-            except ConnectionRefusedError:
-                self.online = False
-            except xmlrpc.client.Fault:
+            except (
+                ConnectionRefusedError,
+                xmlrpc.client.Fault,
+                http.client.BadStatusLine,
+            ):
                 self.online = False
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
@@ -73,21 +76,11 @@ class CAT:
     def __initialize_rigctrld(self):
         try:
             self.rigctrlsocket = socket.socket()
-            self.rigctrlsocket.settimeout(0.5)
+            self.rigctrlsocket.settimeout(0.1)
             self.rigctrlsocket.connect((self.host, self.port))
             logger.debug("Connected to rigctrld")
             self.online = True
-        except ConnectionRefusedError as exception:
-            self.rigctrlsocket = None
-            self.online = False
-            logger.debug("%s", f"{exception}")
-            return
-        except TimeoutError as exception:
-            self.rigctrlsocket = None
-            self.online = False
-            logger.debug("%s", f"{exception}")
-            return
-        except OSError as exception:
+        except (ConnectionRefusedError, TimeoutError, OSError) as exception:
             self.rigctrlsocket = None
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -113,10 +106,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.get_vfo()
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("getvfo_flrig: %s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("getvfo_flrig: %s", f"{exception}")
         return ""
@@ -151,10 +145,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.get_mode()
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("%s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
         return ""
@@ -193,11 +188,11 @@ class CAT:
             self.online = True
             bandwidth = self.server.rig.get_bw()
             return bandwidth[0]
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("getbw_flrig: %s", f"{exception}")
-            return ""
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("getbw_flrig: %s", f"{exception}")
             return ""
@@ -234,11 +229,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.get_power()
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("getpower_flrig: %s", f"{exception}")
-            return ""
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("getpower_flrig: %s", f"{exception}")
             return ""
@@ -268,10 +263,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.get_ptt()
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("%s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
         return "0"
@@ -305,10 +301,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.set_frequency(float(freq))
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("setvfo_flrig: %s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("setvfo_flrig: %s", f"{exception}")
         return False
@@ -342,10 +339,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.set_mode(mode)
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("setmode_flrig: %s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("setmode_flrig: %s", f"{exception}")
         return False
@@ -378,11 +376,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.set_power(power)
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("setpower_flrig: %s", f"{exception}")
-            return False
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("setpower_flrig: %s", f"{exception}")
             return False
@@ -432,10 +430,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.set_ptt(1)
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("%s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
         return "0"
@@ -465,10 +464,11 @@ class CAT:
         try:
             self.online = True
             return self.server.rig.set_ptt(0)
-        except ConnectionRefusedError as exception:
-            self.online = False
-            logger.debug("%s", f"{exception}")
-        except xmlrpc.client.Fault as exception:
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+        ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
         return "0"

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.9.3.1"
+__version__ = "23.10.31"

{not1mm-23.9.3.1.dist-info → not1mm-23.10.31.dist-info}/METADATA

@@ -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
@@ -28,6 +28,8 @@ 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/)
@@ -152,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.
 
@@ -341,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
 
@@ -501,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
 
@@ -513,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.dist-info → not1mm-23.10.31.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=xAZSyfzy_hYoXWIuzWa11zXzuKPoMwQQDu7r9OmyM-c,101871
-not1mm/bandmap.py,sha256=Pc32x83fqJuq7cnEhYgfacYTAMXtUm7Rbdfn3rLg_CM,28668
+not1mm/__main__.py,sha256=2-Uf-vjgx6Fk6wfK675adNKSZu-J83nFaYue8nim5bs,102295
+not1mm/bandmap.py,sha256=AqlXK075VoPKk9G7aIOH895aF_ct9JCwR4SzDfrlkYE,28691
 not1mm/checkwindow.py,sha256=8aeHaZoFoFNAZbVsgBiXtFFCXxpXPxQmQRKerTbACfk,7066
 not1mm/logwindow.py,sha256=W2GFJvBTibY-cvMQz1jPoxXBn_O-zMLLCNaChFlnjWQ,41694
 not1mm/vfo.py,sha256=sN8P9pSTU7whC6d7RSgMeQQ02bEM-IY8-vq5tRsKkQY,10113
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
-not1mm/data/MASTER.SCP,sha256=J7Xi62-SF0vO8X1IvQE5O-dESikT6OVmrT_x80F7f4Y,657382
+not1mm/data/MASTER.SCP,sha256=9S0NzTygOdUi-J7oFwJCeoVRc0nQKQYx3LAQC_w1gsE,712093
 not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
 not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6u5LUIqAYidOQ,224
 not1mm/data/bandmap.ui,sha256=iWl5RSCQMbshLz4EyTnljnsc_HzAd8flUOERxa92ILY,6762
@@ -13,7 +13,7 @@ not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=nc4FRc4D3ozC1jhm96Q2y6rolayKF6OwMrbCSaQ-vbg,2572
 not1mm/data/configuration.ui,sha256=tLpQYrh-orXJ2PzBjapY7uOraZmIlaZF-x1BdlGWZlw,48966
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
-not1mm/data/cty.json,sha256=0l3wUE5vsc9yknd59ffRLFtAPcnXNl2IaKAmQojGBGI,4667346
+not1mm/data/cty.json,sha256=Xrpdby3dsMwbDMmQkdu5TpajFQPENI8a99Od9mIzmro,4721905
 not1mm/data/cwmacros.txt,sha256=PvJ7TxGILq-ErHb6Gbrm-08x76BbCdXb8AY8a7st5mg,451
 not1mm/data/donors.html,sha256=8hNzO3Q5a6p-_3egT1hfOjimPf810tKMUM5ukLzUsGM,116
 not1mm/data/editcontact.ui,sha256=ax-pm4TeECpHl3LSb5z4L403WjPWXZ9KV2it_6gIjqk,27404
@@ -24,11 +24,14 @@ not1mm/data/k6gte.not1mm-128.png,sha256=vWqt3Cgsaguj-BBiIoSJApzzhisPxldM8HZQbZ05
 not1mm/data/k6gte.not1mm-32.png,sha256=yucSwzlmqv3NegdWUvPvZzSgP7G22Ky3se8TWRXvzfI,1108
 not1mm/data/k6gte.not1mm-64.png,sha256=1KQvk0WBckUds79BvIFUt-KdTwQKKvTz6hiJu8MiT68,2152
 not1mm/data/logwindow.ui,sha256=_-wobHhIjALzCswyXIrqNadnLdc88eay1GNF23a-Qh0,970
-not1mm/data/main.ui,sha256=DrWOKMS5DR6l5CDKQol0lqYuCmVfCfVmC6tXGHgRd5g,47716
+not1mm/data/main.ui,sha256=D6ZKfgdNRymiGnvKBNUult5dpHTF9g_UJ7SuQ9sWr0M,48031
 not1mm/data/new_contest.ui,sha256=Mn0kmlZP8h6wCc2jKAeONdl_ci7MWp3df4F4M7xg_uw,20949
 not1mm/data/not1mm.html,sha256=YfPiT9SrSZfsxShbiLTtdCa3rSY6M2haZ2eKV8kmU3c,25793
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
 not1mm/data/pickcontest.ui,sha256=_9JFiJw4l-bRRgNDtVg1DpxreylYd_UqEq0wfcr9gJc,1600
+not1mm/data/radio_green.png,sha256=PXlvRI2x0C8yLVkxRwrZe6tex8k9GtM-1Cj2Vy6KP7o,1234
+not1mm/data/radio_grey.png,sha256=9eOtMHDpQvRYY29D7_vPeacWbwotRXZTMm8EiHE9TW0,1258
+not1mm/data/radio_red.png,sha256=QvkMk7thd_hCEIyK5xGAG4xVVXivl39nwOfD8USDI20,957
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
 not1mm/data/settings.ui,sha256=7r4aZwxKUHQGm8NLQGLINurGMvT_5VMU9p2dznW25bA,40028
 not1mm/data/ssbmacros.txt,sha256=0Qccj4y0nlK-w5da9a9ti-jILkURtwztoDuL_D0pEJM,470
@@ -83,7 +86,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=O9i8ypv2W9KZkPAp2bcRI0J5RgPE5R1vMfU8ZGlok_E,379
-not1mm/lib/cat_interface.py,sha256=5TLfu4rt9xUQiWHtmsmeAsUuckybONLbpJNf03hIwYw,15866
+not1mm/lib/cat_interface.py,sha256=Nt09L53rv1kfaOxEY8bVERo1k_948Cdts7cEo0aXvHk,15122
 not1mm/lib/cwinterface.py,sha256=fZ5BXVyF7by0yGTJVznUTjRCxRt3lJaUIsNC-_mCGP4,3123
 not1mm/lib/database.py,sha256=_sHaJgLgK5l9XZ6i8Bl9eVVTqyYSbS1WH4TY95pYjhk,40681
 not1mm/lib/edit_contact.py,sha256=YwuX-BuIa7AuPtLRENs4jTzxOrtk6MCxZj3BR_bDPW8,357
@@ -98,7 +101,7 @@ not1mm/lib/new_contest.py,sha256=mHKNCS3iKOKN-bT9d8ZK3JemThOZFQ0ikfUSS0-ZTpY,354
 not1mm/lib/select_contest.py,sha256=XQdRUkPAIHIMVsilm82M54b_v9yWpYrZ1nfInJrtZoo,363
 not1mm/lib/settings.py,sha256=tkCWgJ3CpNkGR_IyCTOCIlO6PEPZCShHO9FL-9Wono8,6885
 not1mm/lib/super_check_partial.py,sha256=GlXgtIblL602iW-V6Mmdf5S4FxtzJ95TbPMMa9xXUfg,1692
-not1mm/lib/version.py,sha256=PqrM2xPpRlPBVuk22Y5efQHcur0mXSBVv5z1Fam5j-k,48
+not1mm/lib/version.py,sha256=BrohefTW69F4_a78vdl2EjyfJv1wOQpTOOKNSkyRtQ0,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=VonusY7yTn_KpHTgN1QiOPKXZTiRCqQn3b4VkhUhRqg,14145
 not1mm/plugins/10_10_spring_cw.py,sha256=qi9LvzatghR3xszoPAx9BW1n-6xdR5CLW93HipMOQSo,14150
@@ -129,11 +132,11 @@ not1mm/testing/flrigclient.py,sha256=24r_0HqpoTjyJ6Bqg_HIC8Nn9wjtnwwWQ26I7UprwgA
 not1mm/testing/multicast_listener.py,sha256=2CkiyZ4EQxBX68_1QzGIX9g_UB9-CQq63OH-pUY3FiU,1051
 not1mm/testing/n1mm_listener.py,sha256=UD-qyKEnppQua330WEFKMvMJaNjnYKi7dDuX_RGB5lQ,1099
 not1mm/testing/test.py,sha256=wGblvMlyOCVkEiHbxE6wvLsorim15ehL72_EZLQeWkk,1660
-testing/test.py,sha256=icT6vZPbJaZWJbEZ09nSbPmTFeiaL7LbXqM_sjhDisI,471
+testing/test.py,sha256=TLfLbjDi5SqZVU9zHBQSqw6Szy1IBJUFhJfymU5h9Lg,127
 usb_vfo_knob/code.py,sha256=h59iPPlcYbkXmRcYPQHDBP0yfLEl7fY3VkiIszdQeyI,1057
-not1mm-23.9.3.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.9.3.1.dist-info/METADATA,sha256=LmByIyoloVI--Aqrzw5kamn2pFORGqunPM04CiT3GwQ,24636
-not1mm-23.9.3.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-not1mm-23.9.3.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.9.3.1.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
-not1mm-23.9.3.1.dist-info/RECORD,,
+not1mm-23.10.31.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.10.31.dist-info/METADATA,sha256=nGWLhtErf8jv7huuDjICJm24GcQyrUcRinZ1aIsxkzw,25310
+not1mm-23.10.31.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+not1mm-23.10.31.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.10.31.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
+not1mm-23.10.31.dist-info/RECORD,,

{not1mm-23.9.3.1.dist-info → not1mm-23.10.31.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

testing/test.py

@@ -1,22 +1,7 @@
 """doc"""
-print("Hello")
 
-worked_list = [
-    {"Call": "K5TUX", "Band": 14.0},
-    {"Call": "K5TUX", "Band": 21.0},
-    {"Call": "N2CQR", "Band": 14.0},
-    {"Call": "NE4RD", "Band": 14.0},
-]
+import psutil
 
-temp = {}
-
-for worked_dict in worked_list:
-    call = worked_dict.get("Call")
-    if call in temp:
-        bandlist = temp[call]
-        bandlist.append(worked_dict["Band"])
-        temp[call] = bandlist
-        continue
-    temp[call] = [worked_dict["Band"]]
-
-print(f"{temp}")
+for proc in psutil.process_iter():
+    if len(proc.cmdline()) == 2:
+        print(proc.cmdline()[1])