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

not1mm/__main__.py

@@ -2024,8 +2024,19 @@ class MainWindow(QtWidgets.QMainWindow):
         Returns:
         -------
         None
+
+        Control
+        QWRTYIOPSFGHJLBNM,./;'[]//-
+
+
+        shift control
+        ABCDEFGHIJKLMNOPQRSTUVWXY
         """
         modifier = event.modifiers()
+        # the_key = event.key()
+
+        # print(f"Modifier is {modifier=} Key is {the_key=}")
+
         if (
             event.key() == Qt.Key.Key_Equal
             and modifier == Qt.KeyboardModifier.ControlModifier

not1mm/lib/cat_interface.py

@@ -81,7 +81,11 @@ class CAT:
         }
 
         if self.interface == "flrig":
-            target = f"http://{host}:{port}"
+            if not self.__check_sane_ip(self.host):
+                self.online = False
+                return
+
+            target = f"http://{self.host}:{self.port}"
             logger.debug("%s", target)
             self.server = xmlrpc.client.ServerProxy(target)
             self.online = True
@@ -91,15 +95,30 @@ class CAT:
                 ConnectionRefusedError,
                 xmlrpc.client.Fault,
                 http.client.BadStatusLine,
+                socket.error,
+                socket.gaierror,
             ):
                 self.online = False
         elif self.interface == "rigctld":
+            if not self.__check_sane_ip(self.host):
+                self.online = False
+                return
             self.__initialize_rigctrld()
         elif self.interface == "fake":
             self.online = True
             logger.debug("Using Fake Rig")
         return
 
+    def __check_sane_ip(self, ip: str) -> bool:
+        """check if IP address look normal"""
+        x = ip.split(".")
+        if len(x) != 4:
+            return False
+        for y in x:
+            if not y.isnumeric():
+                return False
+        return True
+
     def __initialize_rigctrld(self):
         try:
             self.rigctrlsocket = socket.socket()
@@ -107,7 +126,13 @@ class CAT:
             self.rigctrlsocket.connect((self.host, self.port))
             logger.debug("Connected to rigctrld")
             self.online = True
-        except (ConnectionRefusedError, TimeoutError, OSError) as exception:
+        except (
+            ConnectionRefusedError,
+            TimeoutError,
+            OSError,
+            socket.error,
+            socket.gaierror,
+        ) as exception:
             self.rigctrlsocket = None
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -233,6 +258,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug(f"{exception=}")
@@ -280,6 +306,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -329,6 +356,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("getbw_flrig: %s", f"{exception}")
@@ -453,6 +481,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -502,6 +531,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("setvfo_flrig: %s", f"{exception}")
@@ -547,6 +577,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug(f"{exception=}")
@@ -590,6 +621,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("setpower_flrig: %s", f"{exception}")
@@ -648,6 +680,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -686,6 +719,7 @@ class CAT:
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            AttributeError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")

not1mm/lib/cwinterface.py

@@ -31,6 +31,9 @@ class CW:
         self.speed = 20
         self.winkeyer_functions = []
         if self.servertype == 2:
+            if not self.__check_sane_ip(self.host):
+                logger.critical(f"Bad IP: {self.host}")
+                return
             with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
                 try:
                     self.winkeyer_functions = proxy.system.listMethods()
@@ -47,6 +50,16 @@ class CW:
                         "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
                     )
 
+    def __check_sane_ip(self, ip: str) -> bool:
+        """check if IP address look normal"""
+        x = ip.split(".")
+        if len(x) != 4:
+            return False
+        for y in x:
+            if not y.isnumeric():
+                return False
+        return True
+
     def sendcw(self, texttosend):
         """sends cw to k1el"""
         logger.debug(f"{texttosend=} {self.servertype=}")
@@ -61,7 +74,7 @@ class CW:
     def _sendcw_xmlrpc(self, texttosend):
         """sends cw to xmlrpc"""
         logger.debug("xmlrpc: %s", texttosend)
-        if texttosend:
+        if texttosend and self.__check_sane_ip(self.host):
             with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
                 try:
                     proxy.k1elsendstring(texttosend)
@@ -76,23 +89,35 @@ class CW:
                     logger.debug(
                         "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
                     )
+        else:
+            logger.critical(f"Bad IP: {self.host}")
 
     def _sendcw_udp(self, texttosend):
         """send cw to udp port"""
         logger.debug("UDP: %s", texttosend)
-        if texttosend:
+        if texttosend and self.__check_sane_ip(self.host):
             server_address_port = (self.host, self.port)
             # bufferSize          = 1024
             udp_client_socket = socket.socket(
                 family=socket.AF_INET, type=socket.SOCK_DGRAM
             )
-            udp_client_socket.sendto(bytes(texttosend, "utf-8"), server_address_port)
+            try:
+                udp_client_socket.sendto(
+                    bytes(texttosend, "utf-8"), server_address_port
+                )
+            except socket.gaierror:
+                ...
+        else:
+            logger.critical(f"Bad IP: {self.host.encode()}")
 
     def _sendcwcat(self, texttosend):
         """..."""
 
     def set_winkeyer_speed(self, speed):
         """doc"""
+        if not self.__check_sane_ip(self.host):
+            logger.critical(f"Bad IP: {self.host}")
+            return
         with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
             try:
                 if "setspeed" in self.winkeyer_functions:

not1mm/lib/version.py

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

not1mm/test.py

@@ -0,0 +1,39 @@
+class CW:
+    """
+
+    An interface to cwdaemon and PyWinkeyerSerial
+
+    servertype: int 1=cwdaemon, 2=pywinkeyer, 3=rigctld
+
+    """
+
+    def __init__(self, servertype: int, host: str, port: int) -> None:
+        self.servertype = servertype
+        self.cat = None
+        self.host = host
+        self.port = port
+        self.speed = 20
+        self.winkeyer_functions = []
+
+    def __check_sane_ip(self, ip: str) -> bool:
+        """check if IP address look normal"""
+        print(f"{type(self.host)} {self.host}")
+
+        x = ip.split(".")
+
+        print(f"{x=} {len(x)=}")
+
+        if len(x) != 4:
+            return False
+        for y in x:
+            if not y.isnumeric():
+                return False
+        return True
+
+    def test(self):
+        """"""
+        print(f"{self.__check_sane_ip(self.host)=}")
+
+
+x = CW(1, "127.0.0.1", 6789)
+x.test()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.10
+Version: 24.11.12.1
 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-12] add check for ipv4 address for CAT.
 - [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.

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

@@ -1,11 +1,12 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=HJWo2CMZpp2kgFSXQ9za-2PnX12Ih3Un18V3zy3U6_U,141893
+not1mm/__main__.py,sha256=8y8-omwssJQfuPTGEebpnXtLjxr4IAO7eG2_RfC-82A,142100
 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=khmyESHaXUDF2hGQ5v3atEOd1YACrOAsuoIA4XgNtlc,5340
+not1mm/test.py,sha256=kTELpu6EFmMIgUrEIwFyvPAKoDokDDFq6U_9yJ7pnOs,865
 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
@@ -94,8 +95,8 @@ 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=b6Y5a0WHawjI5kOalVdqq5_P7rhBqGKXYFMptSzyHXI,22985
-not1mm/lib/cwinterface.py,sha256=3H_Ur5qtZCg6AA-CBURdnS3IUcvs3YAcwYLO0S8SUBg,3621
+not1mm/lib/cat_interface.py,sha256=ZSWXajCu38RI4d-VpGIUUjAMYSSMIPjaUrHkejJKmts,23908
+not1mm/lib/cwinterface.py,sha256=yQL8Dif9oOIynaRItHgvcmu4mYv1TnTpqCHPtkeb09o,4472
 not1mm/lib/database.py,sha256=nqWp2eJ7JfUTqaQ9AVbx3XjgtlRnYY9ruTQCv2YRreY,48310
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
@@ -113,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9
 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=PxG5vkFNHXk38yhcpyOZ-pzC4v3doKTwaaEUaUP4mZk,49
+not1mm/lib/version.py,sha256=-iSAzL-z5BgttDF8dYIz7xmh50rd4o4UomAp5Djzy90,51
 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
@@ -159,9 +160,9 @@ not1mm/plugins/ref_ssb.py,sha256=Z6ZqNInyGFwWNSHXrzCDlokMxZ6NQQ2Yi1c8CGfmNWE,209
 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-24.11.12.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.11.12.1.dist-info/METADATA,sha256=Fo3V88_JTL80XCoXagVEDBGDiKu3HxUxA3KZKeTsXR0,34306
+not1mm-24.11.12.1.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+not1mm-24.11.12.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.11.12.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.11.12.1.dist-info/RECORD,,

{not1mm-24.11.10.dist-info → not1mm-24.11.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any