not1mm 24.10.24.1__tar.gz → 24.10.26__tar.gz

{not1mm-24.10.24.1 → not1mm-24.10.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.24.1
+Version: 24.10.26
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -232,6 +232,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-26] Clear inputs when seeking to a call from the bandmap via the arrow up and down. Fixed bandmap crash from bad telnet data. Drop beacons from bandmap.
+- [24-10-25] Add File Menu option to create either an ASCII or UTF8 Cabrillo.
 - [24-10-24-1] Make all Cabrillo files with UTF-8.
 - [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
 - [24-10-23] Remove duplicate marked calls in the bandmap.

{not1mm-24.10.24.1 → not1mm-24.10.26}/README.md

@@ -201,6 +201,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-26] Clear inputs when seeking to a call from the bandmap via the arrow up and down. Fixed bandmap crash from bad telnet data. Drop beacons from bandmap.
+- [24-10-25] Add File Menu option to create either an ASCII or UTF8 Cabrillo.
 - [24-10-24-1] Make all Cabrillo files with UTF-8.
 - [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
 - [24-10-23] Remove duplicate marked calls in the bandmap.

{not1mm-24.10.24.1 → not1mm-24.10.26}/not1mm/__main__.py

@@ -230,7 +230,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionVFO.triggered.connect(self.launch_vfo)
         self.actionRecalculate_Mults.triggered.connect(self.recalculate_mults)
 
-        self.actionGenerate_Cabrillo.triggered.connect(self.generate_cabrillo)
+        self.actionGenerate_Cabrillo_ASCII.triggered.connect(
+            lambda x: self.generate_cabrillo("ascii")
+        )
+        self.actionGenerate_Cabrillo_UTF8.triggered.connect(
+            lambda x: self.generate_cabrillo("utf-8")
+        )
         self.actionGenerate_ADIF.triggered.connect(self.generate_adif)
 
         self.actionConfiguration_Settings.triggered.connect(
@@ -746,6 +751,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 return
             if msg.get("cmd", "") == "TUNE":
                 # b'{"cmd": "TUNE", "freq": 7.0235, "spot": "MM0DGI"}'
+                self.clearinputs()
                 if self.vfo_window:
                     self.vfo_window.msg_from_main(msg)
                 vfo = msg.get("freq")
@@ -3629,7 +3635,7 @@ class MainWindow(QtWidgets.QMainWindow):
         logger.debug("******ADIF*****")
         self.contest.adif(self)
 
-    def generate_cabrillo(self) -> None:
+    def generate_cabrillo(self, file_encoding: str) -> None:
         """
         Calls the contest Cabrillo file generator. Maybe.
 
@@ -3643,7 +3649,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         logger.debug("******Cabrillo*****")
-        self.contest.cabrillo(self)
+        self.contest.cabrillo(self, file_encoding)
 
 
 def load_fonts_from_dir(directory: str) -> set:

{not1mm-24.10.24.1 → not1mm-24.10.26}/not1mm/bandmap.py

@@ -809,7 +809,10 @@ class BandMapWindow(QDockWidget):
         """Process waiting bytes"""
         while self.socket.bytesAvailable():
             data = self.socket.readLine(1000)
-            data = str(data, "utf-8").strip()
+            try:
+                data = str(data, "utf-8").strip()
+            except UnicodeDecodeError:
+                continue
 
             if "login:" in data or "call:" in data or "callsign:" in data:
                 self.send_command(self.callsignField.text())
@@ -819,6 +822,8 @@ class BandMapWindow(QDockWidget):
                     "set dx mode " + self.settings.get("cluster_mode", "OPEN")
                 )
                 return
+            if "BEACON" in data:
+                return
             if "DX de" in data:
                 parts = data.split()
                 spotter = parts[2]

{not1mm-24.10.24.1 → not1mm-24.10.26}/not1mm/data/main.ui

@@ -1471,7 +1471,8 @@
     <addaction name="actionStationSettings"/>
     <addaction name="separator"/>
     <addaction name="actionGenerate_ADIF"/>
-    <addaction name="actionGenerate_Cabrillo"/>
+    <addaction name="actionGenerate_Cabrillo_ASCII"/>
+    <addaction name="actionGenerate_Cabrillo_UTF8"/>
     <addaction name="separator"/>
     <addaction name="actionEdit_Macros"/>
     <addaction name="separator"/>
@@ -1684,9 +1685,28 @@
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionGenerate_Cabrillo">
+  <action name="actionGenerate_Cabrillo_ASCII">
    <property name="text">
-    <string>Generate Cabrillo</string>
+    <string>Generate Cabrillo ASCII</string>
+   </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono ExtraLight</family>
+    </font>
+   </property>
+   <property name="autoRepeat">
+    <bool>false</bool>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+   <property name="shortcutVisibleInContextMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionGenerate_Cabrillo_UTF8">
+   <property name="text">
+    <string>Generate Cabrillo UTF-8</string>
    </property>
    <property name="font">
     <font>

not1mm-24.10.26/not1mm/lib/version.py

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

{not1mm-24.10.24.1 → not1mm-24.10.26}/not1mm/plugins/10_10_fall_cw.py

@@ -169,7 +169,16 @@ def adif(self):
     gen_adif(self, cabrillo_name)
 
 
-def cabrillo(self):
+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*****")
@@ -186,133 +195,150 @@ def cabrillo(self):
     log = self.database.fetch_all_contacts_asc()
     try:
         with open(filename, "w", encoding="utf-8") as file_descriptor:
-            print("START-OF-LOG: 3.0", end="\r\n", file=file_descriptor)
-            print(
+            output_cabrillo_line(
+                "START-OF-LOG: 3.0",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
                 f"CREATED-BY: Not1MM v{__version__}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"CONTEST: {cabrillo_name}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
             if self.station.get("Club", ""):
-                print(
+                output_cabrillo_line(
                     f"CLUB: {self.station.get('Club', '').upper()}",
-                    end="\r\n",
-                    file=file_descriptor,
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
                 )
-            print(
+            output_cabrillo_line(
                 f"CALLSIGN: {self.station.get('Call','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"LOCATION: {self.station.get('ARRLSection', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            # print(
-            #     f"ARRL-SECTION: {self.pref.get('section', '')}",
-            #     end="\r\n",
-            #     file=file_descriptor,
-            # )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-OPERATOR: {self.contest_settings.get('OperatorCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-ASSISTED: {self.contest_settings.get('AssistedCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-BAND: {self.contest_settings.get('BandCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-TRANSMITTER: {self.contest_settings.get('TransmitterCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
             if self.contest_settings.get("OverlayCategory", "") != "N/A":
-                print(
+                output_cabrillo_line(
                     f"CATEGORY-OVERLAY: {self.contest_settings.get('OverlayCategory','')}",
-                    end="\r\n",
-                    file=file_descriptor,
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
                 )
-            print(
+            output_cabrillo_line(
                 f"GRID-LOCATOR: {self.station.get('GridSquare','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            # print(
-            #     f"CATEGORY: {None}",
-            #     end="\r\n",
-            #     file=file_descriptor,
-            # )
-            print(
+            output_cabrillo_line(
                 f"CATEGORY-POWER: {self.contest_settings.get('PowerCategory','')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
 
-            print(
+            output_cabrillo_line(
                 f"CLAIMED-SCORE: {calc_score(self)}",
-                end="\r\n",
-                file=file_descriptor,
+                "\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', '')}"
-            print(
+            output_cabrillo_line(
                 f"OPERATORS: {ops}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"NAME: {self.station.get('Name', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"ADDRESS: {self.station.get('Street1', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"ADDRESS-CITY: {self.station.get('City', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"ADDRESS-STATE-PROVINCE: {self.station.get('State', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"ADDRESS-POSTALCODE: {self.station.get('Zip', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"ADDRESS-COUNTRY: {self.station.get('Country', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
-            print(
+            output_cabrillo_line(
                 f"EMAIL: {self.station.get('Email', '')}",
-                end="\r\n",
-                file=file_descriptor,
+                "\r\n",
+                file_descriptor,
+                file_encoding,
             )
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
@@ -323,7 +349,7 @@ def cabrillo(self):
 
                 loggeddate = the_date_and_time[:10]
                 loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
-                print(
+                output_cabrillo_line(
                     f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
                     f"{contact.get('StationPrefix', '').ljust(13)} "
                     f"{str(contact.get('SNT', '')).ljust(3)} "
@@ -331,10 +357,11 @@ def cabrillo(self):
                     f"{contact.get('Call', '').ljust(13)} "
                     f"{str(contact.get('RCV', '')).ljust(3)} "
                     f"{str(contact.get('NR', '')).ljust(6)}",
-                    end="\r\n",
-                    file=file_descriptor,
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
                 )
-            print("END-OF-LOG:", end="\r\n", file=file_descriptor)
+            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)