not1mm 25.4.14__tar.gz → 25.4.15__tar.gz

{not1mm-25.4.14 → not1mm-25.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.14
+Version: 25.4.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -254,6 +254,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
 - [25-4-14] Add ES Open HF Chanmpionship.
 - [25-4-13] Fix crash in JIDX Cabrillo output.
 - [25-4-12] Added an Auto CQ time to fire progress bar.

{not1mm-25.4.14 → not1mm-25.4.15}/README.md

@@ -222,6 +222,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
 - [25-4-14] Add ES Open HF Chanmpionship.
 - [25-4-13] Fix crash in JIDX Cabrillo output.
 - [25-4-12] Added an Auto CQ time to fire progress bar.

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm/__main__.py

@@ -11,6 +11,7 @@ Purpose: Provides main logging window and a crap ton more.
 # alt cluster hamqth.com 7300
 
 import datetime
+import time
 import importlib
 import locale
 import logging
@@ -2984,6 +2985,9 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
                 return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
+            if self.pref.get("cwtype") == 2:
+                time.sleep(0.2)
+            return
 
     def toggle_run_sp(self) -> None:
         """Toggles the radioButton_run and radioButton_sp."""
@@ -3707,7 +3711,7 @@ class MainWindow(QtWidgets.QMainWindow):
             result = {"isdupe": False}
         if self.contest.dupe_type == 5:
             result = {"isdupe": False}  # in case contest has no function.
-            if hasattr(self.contest, "check_dupe"):
+            if hasattr(self.contest, "specific_contest_check_dupe"):
                 result = self.contest.specific_contest_check_dupe(self, call)
 
         debugline = f"{result}"

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm/data/donors.html

@@ -12,4 +12,5 @@
 <center>Connor KD9LSV</center>
 <center>Jeff KE9BPZ</center>
 <center>Tarmo ES1TAR</center>
+<center>Anders SM0HPL 5X7W</center>
 </p>

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.4.14"
+__version__ = "25.4.15"

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm/logwindow.py

@@ -71,7 +71,7 @@ class LogWindow(QDockWidget):
     columns = {
         0: "YYYY-MM-DD HH:MM:SS",
         1: "Call",
-        2: "Freq (Khz)",
+        2: "Freq (KHz)",
         3: "Mode",
         4: "Snt",
         5: "Rcv",
@@ -189,7 +189,7 @@ class LogWindow(QDockWidget):
             columns_to_show = msg.get("COLUMNS", [])
             for column in columns_to_show:
                 if column == "Freq":
-                    column = "Freq (Khz)"
+                    column = "Freq (KHz)"
                 self.generalLog.setColumnHidden(self.get_column(column), False)
                 self.focusedLog.setColumnHidden(self.get_column(column), False)
 
@@ -320,7 +320,7 @@ class LogWindow(QDockWidget):
             self.generalLog.item(row, self.get_column("UUID")).text()
         )
         try:
-            _ = float(self.generalLog.item(row, self.get_column("Freq (Khz)")).text())
+            _ = float(self.generalLog.item(row, self.get_column("Freq (KHz)")).text())
         except ValueError:
             self.show_message_box("An invalid value has been entered for frequency.")
             self.get_log()
@@ -331,7 +331,7 @@ class LogWindow(QDockWidget):
                 row, self.get_column("YYYY-MM-DD HH:MM:SS")
             ).text(),
             "Call": self.generalLog.item(row, self.get_column("Call")).text().upper(),
-            "Freq": self.generalLog.item(row, self.get_column("Freq (Khz)")).text(),
+            "Freq": self.generalLog.item(row, self.get_column("Freq (KHz)")).text(),
             "Mode": self.generalLog.item(row, self.get_column("Mode")).text(),
             "SNT": self.generalLog.item(row, self.get_column("Snt")).text(),
             "RCV": self.generalLog.item(row, self.get_column("Rcv")).text(),
@@ -437,7 +437,7 @@ class LogWindow(QDockWidget):
             self.focusedLog.item(row, self.get_column("UUID")).text()
         )
         try:
-            _ = float(self.focusedLog.item(row, self.get_column("Freq (Khz)")).text())
+            _ = float(self.focusedLog.item(row, self.get_column("Freq (KHz)")).text())
         except ValueError:
             self.show_message_box("An invalid value has been entered for frequency.")
             self.get_log()
@@ -448,7 +448,7 @@ class LogWindow(QDockWidget):
                 row, self.get_column("YYYY-MM-DD HH:MM:SS")
             ).text(),
             "Call": self.focusedLog.item(row, self.get_column("Call")).text().upper(),
-            "Freq": self.focusedLog.item(row, self.get_column("Freq (Khz)")).text(),
+            "Freq": self.focusedLog.item(row, self.get_column("Freq (KHz)")).text(),
             "Mode": self.focusedLog.item(row, self.get_column("Mode")).text(),
             "SNT": self.focusedLog.item(row, self.get_column("Snt")).text(),
             "RCV": self.focusedLog.item(row, self.get_column("Rcv")).text(),
@@ -793,7 +793,7 @@ class LogWindow(QDockWidget):
                 widget = QtWidgets.QTableWidgetItem(str(round(0.0, 2)))
             self.generalLog.setItem(
                 number_of_rows,
-                self.get_column("Freq (Khz)"),
+                self.get_column("Freq (KHz)"),
                 widget,
             )
             self.generalLog.setItem(
@@ -955,7 +955,7 @@ class LogWindow(QDockWidget):
                 widget = QtWidgets.QTableWidgetItem(str(round(0.0, 2)))
             self.focusedLog.setItem(
                 number_of_rows,
-                self.get_column("Freq (Khz)"),
+                self.get_column("Freq (KHz)"),
                 widget,
             )
             self.focusedLog.setItem(

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm/plugins/cq_ww_cw.py

@@ -38,7 +38,6 @@
 
 import datetime
 import logging
-import time
 from pathlib import Path
 
 from PyQt6 import QtWidgets
@@ -496,7 +495,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
-                    time.sleep(0.2)
     else:
         if self.current_widget == "callsign":
             if len(self.callsign.text()) > 2:
@@ -522,7 +520,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
-                    time.sleep(0.2)
 
 
 def populate_history_info_line(self):

not1mm-25.4.14/not1mm/plugins/es_ll_kv.py → not1mm-25.4.15/not1mm/plugins/es_open.py

@@ -40,7 +40,7 @@ dupe_type = 5
 
 
 def specific_contest_check_dupe(self, call):
-    """"""
+    """Dupe checking specific to just this contest."""
 
     # constant to split the contest
     contest_length_in_minutes = 60
@@ -53,7 +53,9 @@ def specific_contest_check_dupe(self, call):
     self.contest_start_date = start_date_init.split(" ")[0]
     self.contest_start_time = start_date_init.split(" ")[1]
 
-    start_date_init_date = datetime.strptime(start_date_init, "%Y-%m-%d %H:%M:%S")
+    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 = []
@@ -68,9 +70,12 @@ def specific_contest_check_dupe(self, call):
     time_period_3 = time_periods[2] if len(time_periods) > 2 else None
 
     # get current time in UTC
-    iso_current_time = datetime.now(datetime.timezone.utc)
+    iso_current_time = datetime.datetime.now(datetime.timezone.utc)
     current_time = iso_current_time.replace(tzinfo=None)
 
+    result = {}
+    result["isdupe"] = False
+
     if current_time < time_period_1:
         start_date_init = self.contest_start_date + " " + self.contest_start_time
 
@@ -82,7 +87,7 @@ 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:
+    elif current_time < time_period_2 and current_time >= time_period_1:
         start_date_init = self.contest_start_date + " " + self.contest_start_time
 
         result = self.database.check_dupe_on_period_2_mode(
@@ -94,7 +99,7 @@ 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:
+    elif current_time < time_period_3 and current_time >= time_period_2:
         start_date_init = self.contest_start_date + " " + self.contest_start_time
 
         result = self.database.check_dupe_on_period_3_mode(
@@ -105,10 +110,7 @@ def specific_contest_check_dupe(self, call):
             time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
             time_period_3.strftime("%Y-%m-%d %H:%M:%S"),
         )
-    else:
-        result = self.database.check_dupe_on_period_mode(
-            call, self.contact.get("Band", ""), mode, start_date_init
-        )
+
     return result
 
 

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.14
+Version: 25.4.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -254,6 +254,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
 - [25-4-14] Add ES Open HF Chanmpionship.
 - [25-4-13] Fix crash in JIDX Cabrillo output.
 - [25-4-12] Added an Auto CQ time to fire progress bar.

{not1mm-25.4.14 → not1mm-25.4.15}/not1mm.egg-info/SOURCES.txt

@@ -161,7 +161,7 @@ not1mm/plugins/darc_xmas.py
 not1mm/plugins/ea_majistad_cw.py
 not1mm/plugins/ea_majistad_ssb.py
 not1mm/plugins/ea_rtty.py
-not1mm/plugins/es_ll_kv.py
+not1mm/plugins/es_open.py
 not1mm/plugins/general_logging.py
 not1mm/plugins/helvetia.py
 not1mm/plugins/iaru_fieldday_r1_cw.py

{not1mm-25.4.14 → not1mm-25.4.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.4.14"
+version = "25.4.15"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"