not1mm 25.6.16.1__tar.gz → 25.6.18.1__tar.gz

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.16.1
+Version: 25.6.18.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -246,6 +246,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-6-18] Merged changes from @term73, Adding ES Manual Key contest.
 - [25-6-16] Merged PR from @awandahl SM0HPL, adding ESM buttons to General DX Logging plugin.
 - [25-6-15] Corrected tab focus of rotator windows buttons.
 - [25-6-13] Polished up the Rotator window. Adding Stop and Park. Made the NSWE buttons smaller.

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/README.md

@@ -214,6 +214,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-6-18] Merged changes from @term73, Adding ES Manual Key contest.
 - [25-6-16] Merged PR from @awandahl SM0HPL, adding ESM buttons to General DX Logging plugin.
 - [25-6-15] Corrected tab focus of rotator windows buttons.
 - [25-6-13] Polished up the Rotator window. Adding Stop and Park. Made the NSWE buttons smaller.

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/__main__.py

@@ -3399,7 +3399,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
             # if self.pref.get("cwtype") == 2:
-            time.sleep(0.3)
+            # time.sleep(0.3)
             # return
 
     def toggle_run_sp(self) -> None:

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/data/new_contest.ui

@@ -367,6 +367,11 @@
        <string>ES FIELD DAY</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ES MANUAL KEY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>HELVETIA</string>

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/lib/lookup.py

@@ -74,27 +74,30 @@ class HamDBlookup:
             if root:
                 messages = root.get("messages")
                 callsign = root.get("callsign")
-            if messages:
-                error_text = messages.get("status")
-                logger.debug("HamDB: %s", error_text)
-                if error_text != "OK":
-                    self.error = False
-            if callsign:
-                logger.debug("HamDB: found callsign field")
-                if callsign.get("grid"):
-                    grid = callsign.get("grid")
-                if callsign.get("fname"):
-                    name = callsign.get("fname")
-                if callsign.get("name"):
-                    if not name:
-                        name = callsign.get("name")
-                    else:
-                        name = f"{name} {callsign.get('name')}"
-                if callsign.get("nickname"):
-                    nickname = callsign.get("nickname")
+                if messages is not None:
+                    error_text = messages.get("status")
+                    logger.debug("HamDB: %s", error_text)
+                    if error_text != "OK":
+                        self.error = False
+                if callsign is not None:
+                    logger.debug("HamDB: found callsign field")
+                    if callsign.get("grid"):
+                        grid = callsign.get("grid")
+                    if callsign.get("fname"):
+                        name = callsign.get("fname")
+                    if callsign.get("name"):
+                        if not name:
+                            name = callsign.get("name")
+                        else:
+                            name = f"{name} {callsign.get('name')}"
+                    if callsign.get("nickname"):
+                        nickname = callsign.get("nickname")
         else:
             self.error = True
             error_text = str(query_result.status_code)
+            logger.critical(
+                "HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text
+            )
         logger.info("HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text)
         return grid, name, nickname, error_text
 
@@ -166,12 +169,20 @@ class QRZlookup:
             )
 
             logger.info("\n\n%s\n\n", root)
-            logger.info(
-                "key:%s error:%s message:%s",
-                self.session,
-                self.error,
-                self.message,
-            )
+            if self.error:
+                logger.critical(
+                    "key:%s error:%s message:%s",
+                    self.session,
+                    self.error,
+                    self.message,
+                )
+            else:
+                logger.info(
+                    "key:%s error:%s message:%s",
+                    self.session,
+                    self.error,
+                    self.message,
+                )
         except requests.exceptions.RequestException as exception:
             logger.info("%s", exception)
             self.session = False
@@ -209,7 +220,7 @@ class QRZlookup:
                     )
                     baseroot = xmltodict.parse(query_result.text)
                     root = baseroot.get("QRZDatabase", {})
-        return root.get("Callsign")
+        return root.get("Callsign", {})
 
 
 class HamQTH:

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/lib/plugin_common.py

@@ -338,22 +338,23 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
         self.show_message_box(f"Error saving ADIF file: {error}")
 
 
-def get_station_arrlsection_code(self):
-    # get the station ARRL Section in station settings
-    query = f"SELECT ARRLSection as arrlsection from Station;"
-    # run query
-    result = self.database.exec_sql(query)
-    if result:
-        arrlsection = result.get("arrlsection", "")
-        return arrlsection
-    return ""
+# def get_station_arrlsection_code(self):
+#     # get the station ARRL Section in station settings
+#     query = f"SELECT ARRLSection as arrlsection from Station;"
+#     # run query
+#     result = self.database.exec_sql(query)
+#     if result:
+#         arrlsection = result.get("arrlsection", "")
+#         return arrlsection
+#     return ""
 
-def get_station_state_code(self):
-    # get the station state code in station settings
-    query = f"SELECT state as state from Station;"
-    # run query
-    result = self.database.exec_sql(query)
-    if result:
-        state = result.get("state", "")
-        return state
-    return ""
+
+# def get_station_state_code(self):
+#     # get the station state code in station settings
+#     query = f"SELECT state as state from Station;"
+#     # run query
+#     result = self.database.exec_sql(query)
+#     if result:
+#         state = result.get("state", "")
+#         return state
+#     return ""

not1mm-25.6.18.1/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "25.6.18.1"

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/lookupservice.py

@@ -40,14 +40,14 @@ class LookupService(QDockWidget):
 
             if self.settings.get("useqrz"):
                 self.look_up = QRZlookup(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
             if self.settings.get("usehamqth"):
                 self.look_up = HamQTH(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
     def get_settings(self) -> dict:
@@ -55,6 +55,7 @@ class LookupService(QDockWidget):
         if os.path.exists(fsutils.CONFIG_FILE):
             with open(fsutils.CONFIG_FILE, "rt", encoding="utf-8") as file_descriptor:
                 return loads(file_descriptor.read())
+        return {}
 
     def msg_from_main(self, packet):
         """"""
@@ -74,12 +75,12 @@ class LookupService(QDockWidget):
             self.look_up = None
             if self.settings.get("useqrz"):
                 self.look_up = QRZlookup(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )
 
             if self.settings.get("usehamqth"):
                 self.look_up = HamQTH(
-                    self.settings.get("lookupusername"),
-                    self.settings.get("lookuppassword"),
+                    self.settings.get("lookupusername", ""),
+                    self.settings.get("lookuppassword", ""),
                 )

{not1mm-25.6.16.1 → not1mm-25.6.18.1}/not1mm/plugins/es_field_day.py

@@ -10,9 +10,11 @@ from pathlib import Path
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points, get_station_state_code, get_station_arrlsection_code
+from not1mm.lib.plugin_common import (
+    gen_adif,
+    get_points,
+)
 
-from not1mm.lib.ham_utility import calculate_wpx_prefix
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -56,9 +58,10 @@ estonian_regions = [
     "TL",
     "VC",
     "VO",
-    "VP"
+    "VP",
 ]
 
+
 def specific_contest_check_dupe(self, call):
     """"""
     # get mode from radio state
@@ -85,7 +88,7 @@ def specific_contest_check_dupe(self, call):
     time_period_1 = time_periods[0] if len(time_periods) > 0 else None
     time_period_2 = time_periods[1] if len(time_periods) > 1 else None
     time_period_3 = time_periods[2] if len(time_periods) > 2 else None
- 
+
     # get current time in UTC
     iso_current_time = datetime.now(timezone.utc)
     current_time = iso_current_time.replace(tzinfo=None)
@@ -93,7 +96,11 @@ def specific_contest_check_dupe(self, call):
     result = {}
     result["isdupe"] = False
 
-    if current_time < time_period_1 and current_time >= start_date_init_date:
+    if (
+        time_period_1 is not None
+        and current_time < time_period_1
+        and current_time >= start_date_init_date
+    ):
 
         result = self.database.check_dupe_on_period_mode(
             call,
@@ -103,7 +110,12 @@ def specific_contest_check_dupe(self, call):
             time_period_1.strftime("%Y-%m-%d %H:%M:%S"),
         )
 
-    if current_time < time_period_2 and current_time >= time_period_1:
+    if (
+        time_period_1 is not None
+        and time_period_2 is not None
+        and current_time < time_period_2
+        and current_time >= time_period_1
+    ):
 
         result = self.database.check_dupe_on_period_mode(
             call,
@@ -113,7 +125,12 @@ def specific_contest_check_dupe(self, call):
             time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
         )
 
-    if current_time < time_period_3 and current_time >= time_period_2:
+    if (
+        time_period_2 is not None
+        and time_period_3 is not None
+        and current_time < time_period_3
+        and current_time >= time_period_2
+    ):
 
         result = self.database.check_dupe_on_period_mode(
             call,
@@ -131,6 +148,7 @@ def specific_contest_check_dupe(self, call):
 
     return result
 
+
 def init_contest(self):
     """setup plugin"""
     set_tab_next(self)
@@ -195,13 +213,13 @@ def predupe(self):
 
 def prefill(self):
     """Fill SentNR"""
- 
+
     sent_sxchange_setting = self.contest_settings.get("SentExchange", "")
     if sent_sxchange_setting.strip() == "#":
         result = self.database.get_serial()
         serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         # get station region code from setup ARRLSection field
-        serial_nr = serial_nr + " " + get_station_state_code(self) 
+        serial_nr = serial_nr + " " + self.station.get("State", "")
 
         if serial_nr == "None":
             serial_nr = "001"
@@ -228,15 +246,17 @@ def points(self):
     else:
         return 1
 
+
 def show_mults(self, rtc=None):
     """Return display string for mults"""
 
     # implement here multipliers checks
     # get received number and region code
 
-    call_result = str(self.contact.get("NR", ""))
+    # call_result never used, so commenting it out.
+    # call_result = str(self.contact.get("NR", ""))
     # create placeholders
-    placeholders = ','.join(['?'] * len(estonian_regions)) 
+    placeholders = ",".join(["?"] * len(estonian_regions))
     # main query to filter by regions
     query = f"SELECT count(distinct(SUBSTR(NR, -2)) || ':' || Band || ':' || Mode) as mults from DXLOG where ContestNR = {self.pref.get('contest', '1')} AND CountryPrefix = 'ES' AND NR GLOB '*[A-Z]*' AND substr(NR,-2) IN ({placeholders});"
     # apply params
@@ -248,6 +268,7 @@ def show_mults(self, rtc=None):
         return mult_count
     return 0
 
+
 def show_qso(self):
     """Return qso count"""
     result = self.database.fetch_qso_count()
@@ -592,13 +613,13 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
 
 
-def get_mults(self):
-    """Get mults for RTC XML"""
-    mults = {}
-    mults["country"], mults["state"] = show_mults(self, rtc=True)
-    return mults
+# def get_mults(self):
+#     """Get mults for RTC XML"""
+#     mults = {}
+#     mults["country"], mults["state"] = show_mults(self, rtc=True)
+#     return mults
 
 
-def just_points(self):
-    """Get points for RTC XML"""
-    return get_points(self)
+# def just_points(self):
+#     """Get points for RTC XML"""
+#     return get_points(self)