not1mm 23.8.5__tar.gz → 23.8.6__tar.gz

{not1mm-23.8.5 → not1mm-23.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.8.5
+Version: 23.8.6
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -80,6 +80,7 @@ License-File: LICENSE
       - [Editing a contact](#editing-a-contact)
   - [Recalulate Mults](#recalulate-mults)
   - [Bandmap](#bandmap)
+  - [Check Window](#check-window)
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
@@ -141,6 +142,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-8-6] Add parsing of local log to check window.
 - [23-8-5] Add Check Window. Moved MASTER.SCP stuff to it's own class. Close sub windows when main app closes.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -468,6 +470,14 @@ VFO indicator now displays as small triangle in the frequency tickmarks. A small
 
 Clicked on spots now tune the radio and set the callsign field. Previously worked calls are displayed in red.
 
+## Check Window
+
+`Window`>`Check Window`
+
+As you enter a callsign, the Check Window will show probable matches to calls either in the MASTER.SCP file, or your local log. The MASTER.SCP column will show results for strings of 3 or more matching from the start of the call string. The local log column will show matches of any length appearing anywhere in the string.
+
+![Check Window](https://github.com/mbridak/not1mm/raw/master/pic/checkwindow.png)
+
 ## Cabrillo
 
 Click on `File` > `Generate Cabrillo`

{not1mm-23.8.5 → not1mm-23.8.6}/README.md

@@ -61,6 +61,7 @@
       - [Editing a contact](#editing-a-contact)
   - [Recalulate Mults](#recalulate-mults)
   - [Bandmap](#bandmap)
+  - [Check Window](#check-window)
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
@@ -122,6 +123,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-8-6] Add parsing of local log to check window.
 - [23-8-5] Add Check Window. Moved MASTER.SCP stuff to it's own class. Close sub windows when main app closes.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -449,6 +451,14 @@ VFO indicator now displays as small triangle in the frequency tickmarks. A small
 
 Clicked on spots now tune the radio and set the callsign field. Previously worked calls are displayed in red.
 
+## Check Window
+
+`Window`>`Check Window`
+
+As you enter a callsign, the Check Window will show probable matches to calls either in the MASTER.SCP file, or your local log. The MASTER.SCP column will show results for strings of 3 or more matching from the start of the call string. The local log column will show matches of any length appearing anywhere in the string.
+
+![Check Window](https://github.com/mbridak/not1mm/raw/master/pic/checkwindow.png)
+
 ## Cabrillo
 
 Click on `File` > `Generate Cabrillo`

{not1mm-23.8.5 → not1mm-23.8.6}/not1mm/checkwindow.py

@@ -2,7 +2,7 @@
 """
 Check Window
 """
-# pylint: disable=no-name-in-module, unused-import, no-member
+# pylint: disable=no-name-in-module, unused-import, no-member, invalid-name
 
 import logging
 import pkgutil
@@ -67,9 +67,11 @@ class MainWindow(QMainWindow):
         self.masterList.clear()
         self.telnetList.clear()
         self.callhistoryList.clear()
-        self.logList.hide()
+        # self.logList.hide()
         self.telnetList.hide()
+        self.telnetListLabel.hide()
         self.callhistoryList.hide()
+        self.callhistoryListLabel.hide()
         self.mscp = SCP(WORKING_PATH)
         self._udpwatch = None
         self.udp_fifo = queue.Queue()
@@ -127,6 +129,7 @@ class MainWindow(QMainWindow):
             if json_data.get("cmd", "") == "CALLCHANGED":
                 call = json_data.get("call", "")
                 self.master_list(call)
+                self.log_list(call)
             if json_data.get("cmd", "") == "NEWDB":
                 ...
                 # self.load_new_db()
@@ -149,6 +152,16 @@ class MainWindow(QMainWindow):
             self.masterList.addItem(listItem)
             self.masterList.show()
 
+    def log_list(self, call: str) -> None:
+        """Parse calls in log for matches"""
+        self.logList.clear()
+        if call:
+            result = self.database.get_like_calls_and_bands(call)
+            for calls in result:
+                listItem = QListWidgetItem(calls)
+                self.logList.addItem(listItem)
+                self.logList.show()
+
 
 def load_fonts_from_dir(directory: str) -> set:
     """

not1mm-23.8.6/not1mm/data/checkwindow.ui

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>310</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="font">
+   <font>
+    <family>JetBrains Mono</family>
+    <pointsize>14</pointsize>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>CheckWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="1" column="1">
+     <widget class="QListWidget" name="masterList"/>
+    </item>
+    <item row="1" column="3">
+     <widget class="QListWidget" name="callhistoryList"/>
+    </item>
+    <item row="1" column="2">
+     <widget class="QListWidget" name="telnetList"/>
+    </item>
+    <item row="1" column="0">
+     <widget class="QListWidget" name="logList"/>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="logListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Log</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLabel" name="masterListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Master</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QLabel" name="telnetListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Telnet</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="3">
+     <widget class="QLabel" name="callhistoryListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Call</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>310</width>
+     <height>36</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

{not1mm-23.8.5 → not1mm-23.8.6}/not1mm/lib/database.py

@@ -920,6 +920,43 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def get_like_calls_and_bands(self, call: str) -> dict:
+        """
+        Returns a dict like:
+        {'K5TUX': [14.0, 21.0], 'N2CQR': [14.0], 'NE4RD': [14.0]}
+        """
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select call, band from DXLOG where call like '%{call}%' and ContestNR = {self.current_contest};"
+                )
+                result = cursor.fetchall()
+                worked_list = {}
+                # This converts a list of dicts like:
+                # [
+                #     {"Call": "K5TUX", "Band": 14.0},
+                #     {"Call": "K5TUX", "Band": 21.0},
+                #     {"Call": "N2CQR", "Band": 14.0},
+                #     {"Call": "NE4RD", "Band": 14.0},
+                # ]
+                #
+                # To:
+                # {'K5TUX': [14.0, 21.0], 'N2CQR': [14.0], 'NE4RD': [14.0]}
+                for worked_dict in result:
+                    call = worked_dict.get("Call")
+                    if call in worked_list:
+                        bandlist = worked_list[call]
+                        bandlist.append(worked_dict["Band"])
+                        worked_list[call] = bandlist
+                        continue
+                    worked_list[call] = [worked_dict["Band"]]
+                return worked_list
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def get_unique_band_and_mode(self) -> dict:
         """get count of unique band and mode as {mult: x}"""
         try:

{not1mm-23.8.5 → not1mm-23.8.6}/not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.8.5"
+__version__ = "23.8.6"

{not1mm-23.8.5 → not1mm-23.8.6}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.8.5
+Version: 23.8.6
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -80,6 +80,7 @@ License-File: LICENSE
       - [Editing a contact](#editing-a-contact)
   - [Recalulate Mults](#recalulate-mults)
   - [Bandmap](#bandmap)
+  - [Check Window](#check-window)
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
@@ -141,6 +142,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-8-6] Add parsing of local log to check window.
 - [23-8-5] Add Check Window. Moved MASTER.SCP stuff to it's own class. Close sub windows when main app closes.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -468,6 +470,14 @@ VFO indicator now displays as small triangle in the frequency tickmarks. A small
 
 Clicked on spots now tune the radio and set the callsign field. Previously worked calls are displayed in red.
 
+## Check Window
+
+`Window`>`Check Window`
+
+As you enter a callsign, the Check Window will show probable matches to calls either in the MASTER.SCP file, or your local log. The MASTER.SCP column will show results for strings of 3 or more matching from the start of the call string. The local log column will show matches of any length appearing anywhere in the string.
+
+![Check Window](https://github.com/mbridak/not1mm/raw/master/pic/checkwindow.png)
+
 ## Cabrillo
 
 Click on `File` > `Generate Cabrillo`

{not1mm-23.8.5 → not1mm-23.8.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "23.8.5"
+version = "23.8.6"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"

not1mm-23.8.5/not1mm/data/checkwindow.ui

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>310</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="font">
-   <font>
-    <family>JetBrains Mono</family>
-    <pointsize>14</pointsize>
-   </font>
-  </property>
-  <property name="windowTitle">
-   <string>CheckWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <widget class="QListWidget" name="logList"/>
-    </item>
-    <item row="0" column="1">
-     <widget class="QListWidget" name="masterList"/>
-    </item>
-    <item row="0" column="2">
-     <widget class="QListWidget" name="telnetList"/>
-    </item>
-    <item row="0" column="3">
-     <widget class="QListWidget" name="callhistoryList"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>310</width>
-     <height>36</height>
-    </rect>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>