not1mm 25.6.16.1__py3-none-any.whl → 25.6.18.1__py3-none-any.whl

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/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/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/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/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.6.16.1"
+__version__ = "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/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)

not1mm/plugins/es_manual_key.py

@@ -0,0 +1,651 @@
+""" """
+
+import logging
+import platform
+import datetime
+
+
+from pathlib import Path
+
+from PyQt6 import QtWidgets
+
+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__)
+
+EXCHANGE_HINT = "#"
+
+
+name = "ES MANUAL KEY"
+cabrillo_name = "ES-MANUAL-KEY"
+mode = "CW"  # CW SSB BOTH RTTY
+
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Mode",
+    "Snt",
+    "Rcv",
+    "SentNr",
+    "RcvNr",
+    "PTS",
+]
+
+advance_on_space = [True, True, True, True, True]
+
+# 5 Contest specific dupe check.
+dupe_type = 5
+
+
+def specific_contest_check_dupe(self, call):
+    """"""
+    # get mode from radio state
+    mode = self.radio_state.get("mode", "")
+    """Dupe checking specific to just this contest."""
+    # constant to split the contest - correct ES Open Contest length is 4 hours
+    contest_length_in_minutes = 45
+    split_contest_by_minutes = 15
+
+    period_count = int(contest_length_in_minutes / split_contest_by_minutes)
+
+    # think about generic solution by splitting the contest to n different periods
+    start_date_init = self.contest_settings.get("StartDate", "")
+    start_date_init_date = datetime.datetime.strptime(
+        start_date_init, "%Y-%m-%d %H:%M:%S"
+    )
+
+    # Create time periods dynamically based on period count
+    time_periods = []
+    for i in range(period_count):
+        minutes_to_add = split_contest_by_minutes * (i + 1)
+        time_period = start_date_init_date + datetime.timedelta(minutes=minutes_to_add)
+        time_periods.append(time_period)
+
+    # Assign to variables for backwards compatibility
+    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.datetime.now(datetime.timezone.utc)
+    current_time = iso_current_time.replace(tzinfo=None)
+
+    result = {}
+    result["isdupe"] = False
+
+    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,
+            self.contact.get("Band", ""),
+            mode,
+            start_date_init_date,
+            time_period_1.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
+    if (
+        time_period_2 is not None
+        and time_period_1 is not None
+        and current_time < time_period_2
+        and current_time >= time_period_1
+    ):
+
+        result = self.database.check_dupe_on_period_mode(
+            call,
+            self.contact.get("Band", ""),
+            mode,
+            time_period_1.strftime("%Y-%m-%d %H:%M:%S"),
+            time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
+    if (
+        time_period_3 is not None
+        and time_period_2 is not None
+        and current_time < time_period_3
+        and current_time >= time_period_2
+    ):
+
+        result = self.database.check_dupe_on_period_mode(
+            call,
+            self.contact.get("Band", ""),
+            mode,
+            time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
+            time_period_3.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
+    # just for band and mode if outside of time period
+    else:
+        result = self.database.check_dupe_on_band_mode(
+            call, self.contact.get("Band", ""), mode
+        )
+
+    return result
+
+
+def init_contest(self):
+    """setup plugin"""
+    set_tab_next(self)
+    set_tab_prev(self)
+    interface(self)
+    self.next_field = self.other_2
+
+
+def interface(self):
+    """Setup user interface"""
+    self.field1.show()
+    self.field2.show()
+    self.field3.show()
+    self.field4.show()
+    self.other_label.setText("Sent")
+    self.field3.setAccessibleName("Sent")
+    self.exch_label.setText("SN")
+    self.field4.setAccessibleName("SN")
+
+
+def reset_label(self):
+    """reset label after field cleared"""
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.other_1,
+        self.sent: self.other_1,
+        self.receive: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
+    }
+
+
+def set_tab_prev(self):
+    """Set TAB Advances"""
+    self.tab_prev = {
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.receive: self.callsign,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["SentNr"] = self.other_1.text().upper()
+    self.contact["NR"] = self.other_2.text().upper()
+
+    self.contact["IsMultiplier1"] = 0
+    self.contact["IsMultiplier2"] = 0
+
+
+def predupe(self):
+    """called after callsign entered"""
+
+
+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"))
+        serial_nr_last3 = serial_nr[-3:].zfill(3)
+        if serial_nr_last3 == "None":
+            serial_nr_last3 = "001"
+        # get station license class from setup LicenseClass field - use it for seniority
+        # how many years from the first QSO using club station or individual station
+
+        # The LicenseClass should already be available in the self.station object
+        # serial_nr = get_station_license_class(self) + serial_nr_last3
+        serial_nr = self.station.get("LicenseClass", "") + serial_nr_last3
+
+        if len(self.other_1.text()) == 0:
+            self.other_1.setText(serial_nr)
+    else:
+        self.other_1.setText(sent_sxchange_setting)
+
+
+# Points are awarded for each communication/qso according to the correspondent's broadcasting
+# experience/seniority
+# (i.e. the first two numbers of the received report).
+# To obtain the total number of points, the experience/seniority points for all communications/qsos
+#  (including repeated communications) are added together,
+# to which the competitor's own experience/seniority points
+#  for each period worked are added, i.e. 3 times.
+# To motivate competitors with less experience, operators with up to 10 years of experience
+# (inclusive) are awarded an additional 20 points for each communication/qso,
+# and for operators with an experience range of 11-20 years, an additional 10 points.
+# The competitor must also add the same points 3 times to his/her total to obtain the final result.
+
+
+def points(self):
+    """ """
+    if self.contact_is_dupe > 0:
+        return 0
+
+    _mode = self.contact.get("Mode", "")
+
+    if _mode in "CW":
+
+        call_result = str(self.contact.get("NR", "")).strip()
+
+        # get call seniority
+        try:
+            seniority = int(call_result[:2])
+        except ValueError:
+            seniority = 0
+
+        # get call age (this is not used, so commenting out)
+        # age = call_result[2:4]
+
+        # get call serial number (this is not used, so commenting out)
+        # call_serial_nr = call_result[4:6]
+
+        if seniority < 10:
+            points = seniority + 20
+        elif seniority > 10 and seniority <= 20:
+            points = seniority + 10
+        else:
+            points = seniority
+        return points
+
+    return 0
+
+
+def show_mults(self, rtc=None):
+    """Return display string for mults"""
+    our_prefix = calculate_wpx_prefix(self.station.get("Call", ""))
+    query = f"SELECT count(DISTINCT(substr(WPXPrefix,3,1) || ':' || Band || ':' || Mode)) as mults from DXLOG where ContestNR = {self.pref.get('contest', '1')} AND CountryPrefix = 'ES' AND WPXPrefix != '{our_prefix}';"
+    result = self.database.exec_sql(query)
+    if result:
+        mult_count = result.get("mults", 0)
+        return mult_count
+    return 0
+
+
+def show_qso(self):
+    """Return qso count"""
+    result = self.database.fetch_qso_count()
+    if result:
+        return int(result.get("qsos", 0))
+    return 0
+
+
+# Points are awarded for each communication/qso according to the correspondent's broadcasting experience/seniority
+# (i.e. the first two numbers of the received report).
+# To obtain the total number of points, the experience/seniority points for all communications/qsos
+#  (including repeated communications) are added together,
+# to which the competitor's own experience/seniority points
+#  for each period worked are added, i.e. 3 times.
+# To motivate competitors with less experience, operators with up to 10 years of experience
+# (inclusive) are awarded an additional 20 points for each communication/qso,
+# and for operators with an experience range of 11-20 years, an additional 10 points.
+# The competitor must also add the same points 3 times to his/her total to obtain the final result.
+
+
+def calc_score(self):
+    """Return calculated score"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        contest_points = int(score)
+
+        # egt station seniority number
+        station_seniority = self.station.get("LicenseClass", "")
+        # calc station seniority
+        try:
+            station_seniority_multiplier = 3 * int(station_seniority.strip()[:2])
+        except ValueError:
+            station_seniority_multiplier = 3
+
+        # always add 3 times your own seniority to the overall score
+        contest_points = contest_points + station_seniority_multiplier
+
+        mults = show_mults(self)
+        return contest_points * (mults + 1)
+    return 0
+
+
+def recalculate_mults(self):
+    """Recalculates multipliers after change in logged qso."""
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name, "ES OPEN")
+
+
+def output_cabrillo_line(line_to_output, ending, file_descriptor, file_encoding):
+    """"""
+    print(
+        line_to_output.encode(file_encoding, errors="ignore").decode(),
+        end=ending,
+        file=file_descriptor,
+    )
+
+
+def cabrillo(self, file_encoding):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cqwpx.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    logger.debug("Station: %s", f"{self.station}")
+    logger.debug("Contest: %s", f"{self.contest_settings}")
+    now = datetime.datetime.now()
+    date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.station.get('Call', '').upper()}_{cabrillo_name}_{date_time}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding=file_encoding, newline="") as file_descriptor:
+            output_cabrillo_line(
+                "START-OF-LOG: 3.0",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CREATED-BY: Not1MM v{__version__}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CONTEST: {cabrillo_name}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.station.get("Club", ""):
+                output_cabrillo_line(
+                    f"CLUB: {self.station.get('Club', '').upper()}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"CALLSIGN: {self.station.get('Call','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"LOCATION: {self.station.get('ARRLSection', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-OPERATOR: {self.contest_settings.get('OperatorCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-ASSISTED: {self.contest_settings.get('AssistedCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-BAND: {self.contest_settings.get('BandCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
+            output_cabrillo_line(
+                f"CATEGORY-MODE: {mode}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-TRANSMITTER: {self.contest_settings.get('TransmitterCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.contest_settings.get("OverlayCategory", "") != "N/A":
+                output_cabrillo_line(
+                    f"CATEGORY-OVERLAY: {self.contest_settings.get('OverlayCategory','')}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"GRID-LOCATOR: {self.station.get('GridSquare','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-POWER: {self.contest_settings.get('PowerCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+
+            output_cabrillo_line(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            ops = f"@{self.station.get('Call','')}"
+            list_of_ops = self.database.get_ops()
+            for op in list_of_ops:
+                ops += f", {op.get('Operator', '')}"
+            output_cabrillo_line(
+                f"OPERATORS: {ops}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"NAME: {self.station.get('Name', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS: {self.station.get('Street1', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-STATE-PROVINCE: {self.station.get('State', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-POSTALCODE: {self.station.get('Zip', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-COUNTRY: {self.station.get('Country', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"EMAIL: {self.station.get('Email', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+
+                loggeddate = the_date_and_time[:10]
+                loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
+                output_cabrillo_line(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).ljust(6)}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line("END-OF-LOG:", "\r\n", file_descriptor, file_encoding)
+        self.show_message_box(f"Cabrillo saved to: {filename}")
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        self.show_message_box(f"Error saving Cabrillo: {exception} {filename}")
+        return
+
+
+# def populate_history_info_line(self):
+#     result = self.database.fetch_call_history(self.callsign.text())
+#     if result:
+#         self.history_info.setText(
+#             f"{result.get('Call', '')}, {result.get('Exch1', '')}, {result.get('UserText','...')}"
+#         )
+#     else:
+#         self.history_info.setText("")
+
+
+# def check_call_history(self):
+#     """"""
+#     result = self.database.fetch_call_history(self.callsign.text())
+#     print(f"{result=}")
+#     if result:
+#         self.history_info.setText(f"{result.get('UserText','')}")
+#         if self.other_2.text() == "":
+#             self.other_2.setText(f"{result.get('Exch1', '')}")
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.esm_dict["CQ"],
+        self.esm_dict["EXCH"],
+        self.esm_dict["QRZ"],
+        self.esm_dict["AGN"],
+        self.esm_dict["HISCALL"],
+        self.esm_dict["MYCALL"],
+        self.esm_dict["QSOB4"],
+    ]:
+        if a_button is not None:
+            self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    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 just_points(self):
+#     """Get points for RTC XML"""
+#     return get_points(self)

not1mm/plugins/es_open.py

@@ -78,7 +78,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,
@@ -88,7 +92,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,
@@ -98,7 +107,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,
@@ -108,7 +122,12 @@ def specific_contest_check_dupe(self, call):
             time_period_3.strftime("%Y-%m-%d %H:%M:%S"),
         )
 
-    if current_time < time_period_4 and current_time >= time_period_3:
+    if (
+        time_period_3 is not None
+        and time_period_4 is not None
+        and current_time < time_period_4
+        and current_time >= time_period_3
+    ):
 
         result = self.database.check_dupe_on_period_mode(
             call,
@@ -125,6 +144,7 @@ def specific_contest_check_dupe(self, call):
 
     return result
 
+
 def init_contest(self):
     """setup plugin"""
     set_tab_next(self)
@@ -270,7 +290,7 @@ def cabrillo(self, file_encoding):
     logger.debug("******Cabrillo*****")
     logger.debug("Station: %s", f"{self.station}")
     logger.debug("Contest: %s", f"{self.contest_settings}")
-    now = datetime.datetime.now()
+    now = datetime.now()
     date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
     filename = (
         str(Path.home())
@@ -569,13 +589,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)

{not1mm-25.6.16.1.dist-info → not1mm-25.6.18.1.dist-info}/METADATA

@@ -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.dist-info → not1mm-25.6.18.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=SgbLlUVWGbXy00ThKA_61ApJobDaazLfGabsfo3Mpkg,174828
+not1mm/__main__.py,sha256=x-MFQjObG-GRtx3OrTLvdqUtj6qCQhGfw69myPdWZVU,174830
 not1mm/bandmap.py,sha256=PpoZIuJ8dTj9erW0xYqbyneZrSQ-CEqbpek5jTlc6PQ,31173
 not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
 not1mm/dxcc_tracker.py,sha256=px1m6wcFv-ZDBDKyqSa0IcgAfE9GmQ5mptJHBbnWTcA,4379
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=O2dMaT_BYWsXA_dxsEHN92JwN-qVGy9nmH0MCMaG9gY,42830
-not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
+not1mm/lookupservice.py,sha256=WyLp1m4XPxK0Nk7FH8IKA8jjAs25UcEMrwpCsHmW1fY,2678
 not1mm/radio.py,sha256=4Lysf9BY3vdtYCHwKfzO5WN7IGyh4_lKSVuQ6F4Z08g,5536
 not1mm/ratewindow.py,sha256=iBjqdOetIEX0wSwdGM89Ibt4gVlFdE-K8HQPnkVPVOg,6965
 not1mm/rotator.py,sha256=jrAqO3IkeuZcOgsYFKvEv6DY2ccV85wg0o5sdJa_EUo,12760
@@ -40,7 +40,7 @@ not1mm/data/logwindow.ui,sha256=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
 not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
 not1mm/data/main.ui,sha256=2cGrhepmcTylTWJ2LwisW6q9nZsReOH38yThvUn_31g,65717
 not1mm/data/map3.png,sha256=EJqHeFp0ys6Vb1oKkjL4m0v8i3uWXtIgRrxzi0ETUHM,40704
-not1mm/data/new_contest.ui,sha256=i-WThxa9IBstyAMCRtNMB4NVPpV3fekUIX1YDYPyuOQ,25521
+not1mm/data/new_contest.ui,sha256=dobgydE_RBaQ2YGJ_8FGR8NHYteztOsLmdwq4Wfm1HQ,25631
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
 not1mm/data/pickcontest.ui,sha256=Pbb_YEOzQfacyhIRkx-M3ZGugIIPL1KPztdwVv5c_q0,1696
@@ -117,16 +117,16 @@ not1mm/lib/edit_station.py,sha256=hUpqNgboNqhpFzHzjQI0FI8GId6muECRsaXaphN02kQ,19
 not1mm/lib/fldigi_sendstring.py,sha256=EeXSBRKgyUEzNyHBjMtHiFe-iOU3TcWcCCX77t0ur_I,602
 not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
 not1mm/lib/ham_utility.py,sha256=7vsnk_nPAOHoP5XhMCDX6ll0F8Sm9XOI-DFMjB80ZFI,12105
-not1mm/lib/lookup.py,sha256=KECMDi9tflRDzgTLeDfDl7HGWWRHvW3HCjNHyyjoWaY,10835
+not1mm/lib/lookup.py,sha256=k-BctngA0QEvMo5cPDB9UkUnQvIk69LnJ8bJek2So4U,11326
 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=nqiUq11T9Wz8RDrRen4Zvp-KXVWUYcIp5JPZwqmu2Oo,13913
+not1mm/lib/plugin_common.py,sha256=4M5CqBXPVvqiakmCEV_SvcRHAZrlwYgGRZwfxAw2e9U,13951
 not1mm/lib/rot_interface.py,sha256=bOyxpV9pQHORUY5qfNZE2QAV1V71QEG2jooiI2p9AwE,3744
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=5xnsagH48qGeCDhfxPWW9yaXtv8wT13yoIVvYt8h_Qs,16023
 not1mm/lib/super_check_partial.py,sha256=jX7DjHesEV4KNVQbddJui0wAsYHerikH7W0iPv7PXQw,3110
-not1mm/lib/version.py,sha256=BXK9rv-j6m1DJFcBBrHMRMEUyr4cZvhrOSpryaAtg4w,50
+not1mm/lib/version.py,sha256=6vtRvmqFiXcSqD6LJaNhFmapnntAFFNtZCCGJh245_I,50
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -161,8 +161,9 @@ not1mm/plugins/darc_xmas.py,sha256=p5UNYLdtylsC_sSlxT8NvXXL1oSW0KyUhIN-rJonHgI,1
 not1mm/plugins/ea_majistad_cw.py,sha256=O-GLcW0tMAesw7Ow01M3i6MirbGFXwTcwrY7xJdCYDA,23382
 not1mm/plugins/ea_majistad_ssb.py,sha256=kZoFknVkslHAEjvleV8shsJEwk12Q3aU6qcmBXzVojo,22976
 not1mm/plugins/ea_rtty.py,sha256=r6c85eyGHbx_ZLBIqKI96vIMqCGH0KCZq2pd-GQt_Dg,23259
-not1mm/plugins/es_field_day.py,sha256=neBPerH9TSnVhBFB0bCXVfjBBAYwlDZgcZjqFbmGvNE,19166
-not1mm/plugins/es_open.py,sha256=xFp7fdMMdEZyey99Qws5gd7S5HRiF_gAk7qz4AyWneE,18719
+not1mm/plugins/es_field_day.py,sha256=SMzkLHRbFqUM3VZ5-8KxqOcakSqlusGnLUhtZ4FXrww,19403
+not1mm/plugins/es_manual_key.py,sha256=pnc5Wm5xb10ue5rFfBQ4-YDRd-dSnYJ_-aecLxYVobI,21639
+not1mm/plugins/es_open.py,sha256=SkvweNe0nNoeUFODkC2bwyQMRSm-bK7pidk-6H5C6iY,19089
 not1mm/plugins/general_logging.py,sha256=qon9snE369TC0DUQYH7dezENQ-vl7BH0j3w_Cb0LyU0,8796
 not1mm/plugins/helvetia.py,sha256=nvgFjCq-_5XF0cLiCVFFwAS8NtIIFPDptr8eLsoprGE,20082
 not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=1AVyZFi3ri2zqaNJY181Wtyz74fai8QLoi7PoyXpfaY,17218
@@ -190,9 +191,9 @@ not1mm/plugins/ukeidx.py,sha256=ZsIFXgOSwjuKNmN4W_C0TAgGqgnabJGNLMHwGkl3_bk,1910
 not1mm/plugins/vhf_sprint.py,sha256=a9QFTpv8XUbZ_GLjdVCh7svykFa-gXOWwKFZ6MD3uQM,19289
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.6.16.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.6.16.1.dist-info/METADATA,sha256=TbPB3A5sopjzK7eOR4K0wDJO3lZSvBi6K5YCzFIg15A,36874
-not1mm-25.6.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-not1mm-25.6.16.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.6.16.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.6.16.1.dist-info/RECORD,,
+not1mm-25.6.18.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.6.18.1.dist-info/METADATA,sha256=Siv6s5xx3WIWa4SDjncdlmZmDEsKfOt1QuxpBPM-rT4,36945
+not1mm-25.6.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+not1mm-25.6.18.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.6.18.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.6.18.1.dist-info/RECORD,,