not1mm 24.12.5__py3-none-any.whl → 24.12.6__py3-none-any.whl

not1mm/__main__.py

@@ -611,7 +611,7 @@ class MainWindow(QtWidgets.QMainWindow):
         logger.debug(f"{QT_VERSION_STR=} {PYQT_VERSION_STR=}")
         x = PYQT_VERSION_STR.split(".")
         old_Qt = True
-        # test if pyqt version is at least 6.7.1
+        # test if pyqt version is at least 6.8
         if len(x) == 1:
             if int(x[0]) > 6:
                 old_Qt = False
@@ -619,7 +619,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if int(x[0]) >= 6 and int(x[1]) >= 8:
                 old_Qt = False
 
-        # Featureset for wayland if pyqt is older that 6.7.1
+        # Featureset for wayland if pyqt is older that 6.8
         dockfeatures = (
             QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
@@ -1606,6 +1606,7 @@ class MainWindow(QtWidgets.QMainWindow):
                             self.set_window_title()
                             if self.rig_control:
                                 self.rig_control.set_mode(self.radio_state.get("mode"))
+                        self.update_rtc_xml()
                 except ModuleNotFoundError:
                     self.pref["contest"] = 1
                     self.show_message_box("Contest plugin not found")
@@ -2464,10 +2465,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.worked_list = self.database.get_calls_and_bands()
         self.send_worked_list()
         self.clearinputs()
-        if self.pref.get("send_rtc_scores", False):
-            if hasattr(self.contest, "online_score_xml"):
-                if self.rtc_service is not None:
-                    self.rtc_service.xml = self.contest.online_score_xml(self)
+        self.update_rtc_xml()
         cmd = {}
         cmd["cmd"] = "UPDATELOG"
         if self.log_window:
@@ -2475,6 +2473,15 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.check_window:
             self.check_window.msg_from_main(cmd)
 
+    def update_rtc_xml(self):
+        """Update RTC XML"""
+        if self.pref.get("send_rtc_scores", False):
+            if self.contest is None:
+                return
+            if hasattr(self.contest, "online_score_xml"):
+                if self.rtc_service is not None:
+                    self.rtc_service.xml = self.contest.online_score_xml(self)
+
     def new_contest_dialog(self) -> None:
         """
         Show new contest dialog.
@@ -2919,6 +2926,12 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.rtc_service = None
 
+        self.send_rtc_scores = self.pref.get("send_rtc_scores", False)
+        self.rtc_url = self.pref.get("rtc_url", "")
+        self.rtc_user = self.pref.get("rtc_user", "")
+        self.rtc_pass = self.pref.get("rtc_pass", "")
+        self.rtc_interval = self.pref.get("rtc_interval", 2)
+
         if self.pref.get("send_rtc_scores", False):
             self.rtc_service = RTCService()
             self.rtc_service.moveToThread(self.rtc_thread)
@@ -2926,6 +2939,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.rtc_thread.finished.connect(self.rtc_service.deleteLater)
             # self.rtc_service.poll_callback.connect(self.rtc_result)
             self.rtc_thread.start()
+            self.rtc_service.rtc_callback.connect(self.rtc_response)
 
         try:
             if self.radio_thread.isRunning():
@@ -3075,11 +3089,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.esm_dict["MYCALL"] = fkey_dict.get(self.pref.get("esm_mycall", "DISABLED"))
         self.esm_dict["QSOB4"] = fkey_dict.get(self.pref.get("esm_qsob4", "DISABLED"))
 
-        self.send_rtc_scores = self.pref.get("send_rtc_scores", False)
-        self.rtc_url = self.pref.get("rtc_url", "")
-        self.rtc_user = self.pref.get("rtc_user", "")
-        self.rtc_pass = self.pref.get("rtc_pass", "")
-        self.rtc_interval = self.pref.get("rtc_interval", 2)
+        self.update_rtc_xml()
 
     def dark_mode_state_changed(self) -> None:
         """Called when the Dark Mode menu state is changed."""
@@ -3087,6 +3097,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.write_preference()
         self.setDarkMode(self.actionDark_Mode_2.isChecked())
 
+    def rtc_response(self, response):
+        print(f"{response=}")
+
     def cw_macros_state_changed(self) -> None:
         """
         Menu item to show/hide macro buttons.

not1mm/lib/plugin_common.py

@@ -73,11 +73,9 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
     """
     now = datetime.datetime.now()
     date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
-    station_callsign = self.station.get('Call', '').upper()
+    station_callsign = self.station.get("Call", "").upper()
     filename = (
-        str(Path.home())
-        + "/"
-        + f"{station_callsign}_{cabrillo_name}_{date_time}.adi"
+        str(Path.home()) + "/" + f"{station_callsign}_{cabrillo_name}_{date_time}.adi"
     )
     log = self.database.fetch_all_contacts_asc()
     try:

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.5"
+__version__ = "24.12.6"

not1mm/plugins/arrl_160m.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -123,7 +123,48 @@ def points(self):
 
     # Both in same country
 
-    if mypfx in ["K", "VE"] and pfx in ["K", "VE"]:
+    # 2.1.1 Alaska (KL7 – AK) and Hawaii (KH6 – PAC), the Caribbean US possessions (KP1-KP5 -
+    # PR or VI), and all of the Pacific Ocean territories (KHØ-KH9 – PAC) participate as W/VE stations
+    # and count as ARRL sections.
+    if mypfx in [
+        "K",
+        "KL",
+        "KH0",
+        "KH1",
+        "KH2",
+        "KH3",
+        "KH4",
+        "KH5",
+        "KH6",
+        "KH7",
+        "KH8",
+        "KH9",
+        "KP1",
+        "KP2",
+        "KP3",
+        "KP4",
+        "KP5",
+        "VE",
+    ] and pfx in [
+        "K",
+        "KL",
+        "KH0",
+        "KH1",
+        "KH2",
+        "KH3",
+        "KH4",
+        "KH5",
+        "KH6",
+        "KH7",
+        "KH8",
+        "KH9",
+        "KP1",
+        "KP2",
+        "KP3",
+        "KP4",
+        "KP5",
+        "VE",
+    ]:
         return 2
 
     if mypfx.upper() != pfx.upper():
@@ -134,8 +175,10 @@ def points(self):
 
 def show_mults(self):
     """Return display string for mults"""
-    result = self.database.fetch_country_count()
-    mults = int(result.get("dxcc_count", 0))
+    mults = 0
+    if can_claim_dxcc(self):
+        result = self.database.fetch_country_count()
+        mults = int(result.get("dxcc_count", 0))
 
     result = self.database.fetch_exchange1_unique_count()
     mults2 = int(result.get("exch1_count", 0))
@@ -153,6 +196,7 @@ def show_qso(self):
 
 def calc_score(self):
     """Return calculated score"""
+    mults = 0
     result = self.database.fetch_points()
     if result is not None:
         score = result.get("Points", "0")
@@ -160,8 +204,9 @@ def calc_score(self):
             score = "0"
         contest_points = int(score)
 
-        result = self.database.fetch_country_count()
-        mults = int(result.get("dxcc_count", 0))
+        if can_claim_dxcc(self):
+            result = self.database.fetch_country_count()
+            mults = int(result.get("dxcc_count", 0))
 
         result = self.database.fetch_exchange1_unique_count()
         mults2 = int(result.get("exch1_count", 0))
@@ -169,6 +214,37 @@ def calc_score(self):
     return 0
 
 
+def can_claim_dxcc(self):
+    """"""
+    result = self.cty_lookup(self.station.get("Call", ""))
+    if result:
+        mypfx = ""
+        for item in result.items():
+            mypfx = item[1].get("primary_pfx", "")
+        if mypfx in [
+            "K",
+            "KL",
+            "KH0",
+            "KH1",
+            "KH2",
+            "KH3",
+            "KH4",
+            "KH5",
+            "KH6",
+            "KH7",
+            "KH8",
+            "KH9",
+            "KP1",
+            "KP2",
+            "KP3",
+            "KP4",
+            "KP5",
+            "VE",
+        ]:
+            return True
+        return False
+
+
 def adif(self):
     """Call the generate ADIF function"""
     gen_adif(self, cabrillo_name, "ARRL 160-Meter")
@@ -381,14 +457,6 @@ def cabrillo(self, file_encoding):
         return
 
 
-# def trigger_update(self):
-#     """Triggers the log window to update."""
-#     cmd = {}
-#     cmd["cmd"] = "UPDATELOG"
-#     cmd["station"] = platform.node()
-#     self.multicast_interface.send_as_json(cmd)
-
-
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
     # all_contacts = self.database.fetch_all_contacts_asc()
@@ -541,3 +609,19 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('Exch1', '')}")
+
+
+def get_mults(self):
+    """"""
+    mults = {}
+    if can_claim_dxcc(self):
+        mults["country"] = self.database.fetch_country_count().get("dxcc_count", 0)
+
+    mults["state"] = self.database.fetch_exchange1_unique_count().get("exch1_count", 0)
+
+    return mults
+
+
+def just_points(self):
+    """"""
+    return self.database.fetch_points().get("Points", "0")

not1mm/plugins/k1usn_sst.py

@@ -28,7 +28,7 @@ from pathlib import Path
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -506,3 +506,23 @@ def check_call_history(self):
             self.other_1.setText(f"{result.get('Name', '')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('Exch1', '')}")
+
+
+# --------RTC Stuff-----------
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["state"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        return int(score)
+    return 0

not1mm/rtc_service.py

@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 class RTCService(QObject):
     """The RTC Service class."""
 
-    poll_callback = pyqtSignal(dict)
+    rtc_callback = pyqtSignal(dict)
     delta = 2  # two minutes
     poll_time = datetime.datetime.now() + datetime.timedelta(minutes=delta)
     time_to_quit = False
@@ -44,6 +44,7 @@ class RTCService(QObject):
         while not self.time_to_quit:
             # if self.pref.get("send_rtc_scores", False) is True:
             if datetime.datetime.now() > self.poll_time:
+                response = ""
                 self.poll_time = datetime.datetime.now() + datetime.timedelta(
                     minutes=self.delta
                 )
@@ -60,15 +61,15 @@ class RTCService(QObject):
                             ),
                             timeout=30,
                         )
-                        print(f"{self.xml=}\n{result=}\n{result.text}")
+                        response = f"{result.status_code}|{result.reason}|{result.text}"
                     except requests.exceptions.Timeout:
-                        print("RTC post timeout.")
+                        response = "RTC post timeout."
                     except requests.exceptions.RequestException as e:
-                        print(f"An RTC post error occurred: {e}")
+                        response = f"An RTC post error occurred: {e}"
                 else:
-                    print("No XML data")
+                    response = "No XML data"
                 try:
-                    self.poll_callback.emit({"success": True})
+                    self.rtc_callback.emit({"result": response})
                 except QEventLoop:
                     ...
             QThread.msleep(1)

{not1mm-24.12.5.dist-info → not1mm-24.12.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.5
+Version: 24.12.6
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -211,6 +211,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
+- ARRL 160M
 - ARRL DX CW, SSB
 - ARRL Field Day
 - ARRL Sweepstakes CW, SSB
@@ -238,6 +239,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-6] Add RTC to K1USN.
+-[24-12-5-1] ARRL 160 gets rtc.
 - [24-12-5] Add 'real time' score posting to external sites.
 - [24-12-4] Merged PR from @alduhoo Add STATION_CALLSIGN field to ADIF output
 - [24-12-3-1] Adding ARRL 160
@@ -619,6 +622,7 @@ On the Options TAB you can:
 
 - Select to use Enter Sends Message (ESM), and configure it's function keys.
 - Select whether or not to use Call History info.
+- Select whether or not to send XML score info to online scoreboards.
 
 ![Options Screen](https://github.com/mbridak/not1mm/blob/master/pic/configuration_options.png?raw=true)
 

{not1mm-24.12.5.dist-info → not1mm-24.12.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=4NazDz0wMfre9nXHwdtAZZtkQkEbCUeo4IiquZeuxWg,144335
+not1mm/__main__.py,sha256=NhY8RJUM533ou_u-YjuZSV9AWCkQ1jf-MKjM0ghWgW0,144696
 not1mm/bandmap.py,sha256=zD3aUf36NVQCy0plAcZLNxYhSEM9xZ8J1Cu9vrcFPYA,31136
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
 not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
 not1mm/radio.py,sha256=c4m7Ci38uKGKxB0JUT5uOKalI_Mm8Vmixu5D_roN5z4,5400
-not1mm/rtc_service.py,sha256=Fu_Ru0GR2wcTfmbnt8cIAC5BJfPQEb4kuSTyQohZoi8,2756
+not1mm/rtc_service.py,sha256=axAwnCBuTr-QL0YwXtWvg9tjwhcFsiiEZFgFjOofX6k,2816
 not1mm/test.py,sha256=RN71m2S9MPIOJMaoCi0wZhwEhpEZunvtosZxaKahRB4,101
 not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
@@ -111,11 +111,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/plugin_common.py,sha256=-aduWHc_YEQKAFFYXblC7UGq9ymcxhEPL_LKgwDD7_w,13157
+not1mm/lib/plugin_common.py,sha256=gpYDYRu_-w8QiLNXPLjKzE47Fhgv-q7yrLu0-BwEpVY,13141
 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=Gq_FT5obxRUq85-MUXiLa6wBTa2vTHKIXlLWiMe9oRY,48
+not1mm/lib/version.py,sha256=Y733EEADBRN-bkIKXrCFMSoVV0drC1bWD8H8Tx3wHpQ,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=AsvB2VUd6Qb2_FzZkSBkSd1_qeP8Dt-B-exF1Pzb9tk,14469
 not1mm/plugins/10_10_spring_cw.py,sha256=nA4v0oqlp-ivvKqNPakb19I-wE_ElhvH5bCzDRx00JU,14474
@@ -123,7 +123,7 @@ not1mm/plugins/10_10_summer_phone.py,sha256=FNcTQoyZCeAW2i3SKYYDZWuJS1vmk1CO4XO1
 not1mm/plugins/10_10_winter_phone.py,sha256=NRAKgu4oYzrpUtjUKWgCfZQf3b85sdVe9oyl-yD6kJo,14486
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_10m.py,sha256=-stuBD3DCdlWctxE9bWEeznZrgIfNw7VcMIE1ZmsfMo,17942
-not1mm/plugins/arrl_160m.py,sha256=azm0SV-bTDHe2LDK1TjVgRLajlv2vnKZrpN7wgTv7ho,18441
+not1mm/plugins/arrl_160m.py,sha256=idirBXY1XmzxdEyuodGUBsDwLN7JaNtpdix9f3lceRQ,20127
 not1mm/plugins/arrl_dx_cw.py,sha256=1epTIf9TjeUCjYlpRDU54Ig3lJdXa2e5JZI9SCGE080,17400
 not1mm/plugins/arrl_dx_ssb.py,sha256=IEZ6tlP9stW3Mdr5_qTBS77hjAUU43IpagyPjr0eqaQ,17403
 not1mm/plugins/arrl_field_day.py,sha256=YEyXr1Ytllq12sCj54erOba0wrblwb0_bq51gj75OIQ,16478
@@ -152,7 +152,7 @@ not1mm/plugins/iaru_hf.py,sha256=RcVf0UFaHX0eSpUZMMGHC0HTsOy_SwTH9Yi9SeJNQUA,157
 not1mm/plugins/icwc_mst.py,sha256=iFV7iHdI8BLnag-gkQ2q0S4h9n7jXoZ0oTJxtTG14OU,16366
 not1mm/plugins/jidx_cw.py,sha256=KJOE3fU0KVMqD5IqvnN3YDHPEwrMx3yJZBmCtAIP7WQ,15650
 not1mm/plugins/jidx_ph.py,sha256=1l92EmDZJFRGZjR1VrISgFc8KoHVfmJvLsaVsuufIMs,14599
-not1mm/plugins/k1usn_sst.py,sha256=71uO6nUf86J77qSQIiYl_H9EKa2iwyHijcMOk61q6uQ,16653
+not1mm/plugins/k1usn_sst.py,sha256=dbYOZgrMWK-O2pX3dnxiC27a0nghgh3f_9oFwRNCQwc,17043
 not1mm/plugins/lz-dx.py,sha256=I9k67Q9ifSfbrd0ptfr6nOsp6PGfzLifQlVLJYJeOBk,19505
 not1mm/plugins/naqp_cw.py,sha256=oe0Ytx185hUGvebSc0vzFwdBOpNkIFRgGabGSmaV7H8,18576
 not1mm/plugins/naqp_rtty.py,sha256=7bGe33TP4VSVgwv3-pPa8Xfkx0SXbe8sV-0LmTlOugo,22260
@@ -164,9 +164,9 @@ not1mm/plugins/ref_ssb.py,sha256=G2Gz4kApchmOZQVnBexEokSEvdb-mZWJAfyJ1D6JDGY,204
 not1mm/plugins/stew_perry_topband.py,sha256=Gy_vv6tgkR-3vmvsUVO0pVfHMkUJSxpt7G4secn0RH8,15084
 not1mm/plugins/weekly_rtty.py,sha256=PI0_AtEdZZKGAuKnP-b2EYn9xwCN1Ablk38trbNP3Rc,19603
 not1mm/plugins/winter_field_day.py,sha256=9w3tDL9ZWiENSTERc3vzDbBktvI7pnyNvlH6fDjAi08,14841
-not1mm-24.12.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.12.5.dist-info/METADATA,sha256=Ar9RMBUq1lqLo-121C91gleMPhRr1xnRINb7-l50MfE,35509
-not1mm-24.12.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.12.5.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.12.5.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.12.5.dist-info/RECORD,,
+not1mm-24.12.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.12.6.dist-info/METADATA,sha256=oiVHT7cgjLaxapmDVRw5lCg7fQPCT3cAlnVQ35wDDzs,35653
+not1mm-24.12.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.12.6.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.12.6.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.12.6.dist-info/RECORD,,