not1mm 24.4.9.4__py3-none-any.whl → 24.4.17__py3-none-any.whl

not1mm/checkwindow.py

@@ -258,39 +258,43 @@ class CheckWindow(QDockWidget):
                 filter(lambda x: x, [x.get("callsign", None) for x in spots]),
             )
 
-    def populate_layout(self, layout, call_list):
+    def populate_layout(self, layout, call_list) -> None:
+        """Apply blackmagic to a layout."""
         for i in reversed(range(layout.count())):
             if layout.itemAt(i).widget():
                 layout.itemAt(i).widget().setParent(None)
             else:
                 layout.removeItem(layout.itemAt(i))
-        labels = []
+        call_items = []
         for call in call_list:
             if call:
                 if self.call:
                     label_text = ""
+                    diff_score = 0
                     for tag, i1, i2, j1, j2 in Levenshtein.opcodes(call, self.call):
-                        # logger.debug('{:7}   a[{}:{}] --> b[{}:{}] {!r:>8} --> {!r}'.format(
-                        #    tag, i1, i2, j1, j2, call[i1:i2], self.call[j1:j2]))
                         if tag == "equal":
                             label_text += call[i1:i2]
                             continue
                         elif tag == "replace":
                             label_text += f"<span style='background-color: {self.character_remove_color};'>{call[i1:i2]}</span>"
+                            diff_score += max((i2 - i1), (j2 - j1)) * (
+                                len(call) + 1 - i2
+                            )
                         elif tag == "insert" or tag == "delete":
                             label_text += f"<span style='background-color: {self.character_add_color};'>{call[i1:i2]}</span>"
-                    labels.append(
-                        (
-                            Levenshtein.hamming(call, self.call),
-                            CallLabel(
-                                label_text, call=call, callback=self.item_clicked
-                            ),
-                        )
-                    )
-
-        for _, label in sorted(labels, key=lambda x: x[0]):
+                            diff_score += max((i2 - i1), (j2 - j1)) * (len(call) - i2)
+                    call_items.append((diff_score, label_text, call))
+
+        call_items = sorted(call_items, key=lambda x: x[0])
+        for i in reversed(range(layout.count())):
+            if layout.itemAt(i).widget():
+                layout.itemAt(i).widget().setParent(None)
+            else:
+                layout.removeItem(layout.itemAt(i))
+
+        for _, label_text, call in call_items:
+            label = CallLabel(label_text, call=call, callback=self.item_clicked)
             layout.addWidget(label)
-        # top aligns
         layout.addStretch(0)
 
 
@@ -307,6 +311,6 @@ class CallLabel(QLabel):
         self.call = call
         self.callback = callback
 
-    def mouseDoubleClickEvent(self, e: QMouseEvent) -> None:
+    def mouseReleaseEvent(self, e: QMouseEvent) -> None:
         if self.call and self.callback:
             self.callback(self.call)

not1mm/data/settings.ui

@@ -1201,7 +1201,7 @@
       <string>club name</string>
      </property>
      <property name="placeholderText">
-      <string>Americal Radio Relay League</string>
+      <string>American Radio Relay League</string>
      </property>
     </widget>
    </item>

not1mm/fsutils.py

@@ -11,27 +11,21 @@ import platform
 import sys
 import subprocess
 from pathlib import Path
-
 from appdata import AppDataPaths
 
 WORKING_PATH = Path(os.path.dirname(os.path.abspath(__file__)))
-
 MODULE_PATH = WORKING_PATH
-
-
 APP_DATA_PATH = MODULE_PATH / "data"
-_app_paths = AppDataPaths(name="not1mm")
-_app_paths.setup()
-
 DATA_PATH = os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local" / "share"))
 DATA_PATH += "/not1mm"
 USER_DATA_PATH = Path(DATA_PATH)
-LOG_FILE = USER_DATA_PATH / "application.log"
 _CONFIG_PATH = os.environ.get("XDG_CONFIG_HOME", str(Path.home() / ".config"))
 _CONFIG_PATH += "/not1mm"
 CONFIG_PATH = Path(_CONFIG_PATH)
 CONFIG_FILE = CONFIG_PATH / "not1mm.json"
+LOG_FILE = USER_DATA_PATH / "not1mm_debug.log"
 
+# Create directories if they do not exist on Linux systems
 if platform.system() not in ["Windows", "Darwin"]:
     try:
         os.mkdir(CONFIG_PATH)
@@ -42,15 +36,16 @@ if platform.system() not in ["Windows", "Darwin"]:
     except FileExistsError:
         ...
 
+# Define and create directories if they do not exist on Windows or Mac systems
 if platform.system() in ["Windows", "Darwin"]:
+    _app_paths = AppDataPaths(name="not1mm")
+    _app_paths.setup()
     LOG_FILE = _app_paths.get_log_file_path(name="appplication.log")
     _DATA_PATH = Path(_app_paths.app_data_path)
     USER_DATA_PATH = _DATA_PATH
     CONFIG_PATH = USER_DATA_PATH
     CONFIG_FILE = CONFIG_PATH / "not1mm.json"
 
-DARK_STYLESHEET = ""
-
 
 def openFileWithOS(file):
     """Open a file with the default program for that OS."""
@@ -60,4 +55,3 @@ def openFileWithOS(file):
         subprocess.Popen(["open", file])
     else:
         subprocess.Popen(["xdg-open", file])
-        # os.system(f"xdg-open {fsutils.USER_DATA_PATH / macro_file}")

not1mm/lib/settings.py

@@ -2,7 +2,13 @@
 
 import logging
 from PyQt6 import QtWidgets, uic
-import sounddevice as sd
+
+try:
+    import sounddevice as sd
+except OSError as exception:
+    print(exception)
+    print("portaudio is not installed")
+    sd = None
 
 
 class Settings(QtWidgets.QDialog):
@@ -15,7 +21,10 @@ class Settings(QtWidgets.QDialog):
         uic.loadUi(app_data_path / "configuration.ui", self)
         self.buttonBox.accepted.connect(self.save_changes)
         self.preference = pref
-        self.devices = sd.query_devices()
+        if sd:
+            self.devices = sd.query_devices()
+        else:
+            self.devices = []
         self.setup()
 
     def setup(self):

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.9.4"
+__version__ = "24.4.17"

{not1mm-24.4.9.4.dist-info → not1mm-24.4.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.9.4
+Version: 24.4.17
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
+- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
 - [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
 - [24-4-9-3] Ugh. It's not a real day unless you forget to test.
 - [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
@@ -224,7 +226,7 @@ pip install -U not1mm
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install -y libportaudio2 pipx
+sudo apt install -y libportaudio2 pipx libxcb-cursor0
 pipx install not1mm
 pipx ensurepath
 ```

{not1mm-24.4.9.4.dist-info → not1mm-24.4.17.dist-info}/RECORD

@@ -1,8 +1,8 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/__main__.py,sha256=Lnwp-STJRcTvjH65oYBTIHcjQ-l0tN0pVsRJylkLJds,123143
 not1mm/bandmap.py,sha256=3kmRYItrBqpjudFb2NnkGNJpDWkwOpGPQbKwHmYnQ-o,34021
-not1mm/checkwindow.py,sha256=2RLnn3xrFH1EA3UEUU3_Y1UGWvvdQFgLTCM1Wd0WIjM,10160
-not1mm/fsutils.py,sha256=Li8Tq9K7c_q7onOHOQ7u1dOOFfhIIz5Aj2LKuQtGOO4,1652
+not1mm/checkwindow.py,sha256=JiVjJO2RJlFDybeVnBQ8yi-1DnS5aiWs2QTHp_bbn5M,10381
+not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=UcO8mgs_E7ier2gg_1ESTaRxABEvcpCwKmSibm7hl74,44603
 not1mm/vfo.py,sha256=pRRj0XTbeTU9noo3nC1dbg26VYj6gHEw_srUDbyYqC0,12169
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
@@ -35,7 +35,7 @@ not1mm/data/radio_green.png,sha256=PXlvRI2x0C8yLVkxRwrZe6tex8k9GtM-1Cj2Vy6KP7o,1
 not1mm/data/radio_grey.png,sha256=9eOtMHDpQvRYY29D7_vPeacWbwotRXZTMm8EiHE9TW0,1258
 not1mm/data/radio_red.png,sha256=QvkMk7thd_hCEIyK5xGAG4xVVXivl39nwOfD8USDI20,957
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
-not1mm/data/settings.ui,sha256=7r4aZwxKUHQGm8NLQGLINurGMvT_5VMU9p2dznW25bA,40028
+not1mm/data/settings.ui,sha256=Yvv86OgXS8S3RmM16biDmvS7gp-1FssKoEjmrHy3SSk,40028
 not1mm/data/ssbmacros.txt,sha256=0Qccj4y0nlK-w5da9a9ti-jILkURtwztoDuL_D0pEJM,470
 not1mm/data/vfo.ui,sha256=ixer0pVVr8o21j_AmBA3J1OEGd96EXVFhkoNhqIQG10,2054
 not1mm/data/phonetics/0.wav,sha256=0OpYiR-3MK6fVHE6MB-HeOxSAPiDNMjqvx5JcIZtsQk,42590
@@ -103,9 +103,9 @@ not1mm/lib/n1mm.py,sha256=V1NiNyOHaPNYKe_vRsq44O1R42N8uS5PlfRa5Db4Tv0,5712
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8605
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=tlXlJUUZP0IFwIDc9DboM5_1by_tHNtMXvyJ0E7B6RI,8877
+not1mm/lib/settings.py,sha256=i4Za_BZDl9UotB10o8sjIkzRdR0493rMI5VaQltUZHA,9054
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=06fmfLwWI9hb-A27faMR1y0sqUnEMb0YBGRYHJWMbzk,49
+not1mm/lib/version.py,sha256=lp8En1g4BUa0u7XbiLsPUscE8NtGX9YMYd2kh52bs_M,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=fUjfwjuscDjicXIxsO0JHh7xTR9Vu0iPsrOLb896Qak,10873
 not1mm/plugins/10_10_spring_cw.py,sha256=WNaJP5mBQfaB6SxnFI0Vawt3AKDr94tKVtAK-EVhtUY,10878
@@ -139,9 +139,9 @@ not1mm/plugins/naqp_ssb.py,sha256=IWksulcb2_DxlkeW0h3048t8I-u00G_67KBVKkp-TV4,11
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=DIMI3mGMKokXXb9pPLqdhBI6JVnnIs7ZnAL23nFmshE,10588
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.4.9.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.9.4.dist-info/METADATA,sha256=HYDIoFIrNwJg0iEXvSwr3atwoVaNk9xtvWLN7wwbWOA,27317
-not1mm-24.4.9.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.9.4.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.9.4.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.9.4.dist-info/RECORD,,
+not1mm-24.4.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.17.dist-info/METADATA,sha256=ukzMJCzVTz35GsO7Fw9cV5dL5DjnwDqKZ9DJnna9m9Q,27573
+not1mm-24.4.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.17.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.17.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.17.dist-info/RECORD,,