not1mm 23.8.5__py3-none-any.whl → 23.8.6__py3-none-any.whl

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/data/checkwindow.ui

@@ -21,17 +21,69 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
+    <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="QListWidget" name="masterList"/>
+     <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="QListWidget" name="telnetList"/>
+     <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="QListWidget" name="callhistoryList"/>
+     <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>

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

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

{not1mm-23.8.5.dist-info → not1mm-23.8.6.dist-info}/METADATA

@@ -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
@@ -89,6 +89,7 @@ Requires-Dist: notctyparser >=23.6.21
       - [Editing a contact](#editing-a-contact)
   - [Recalulate Mults](#recalulate-mults)
   - [Bandmap](#bandmap)
+  - [Check Window](#check-window)
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
@@ -150,6 +151,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.
@@ -477,6 +479,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.dist-info → not1mm-23.8.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/__main__.py,sha256=epgycpDTK2ELV0NNwQcoukeC7sJVSdSkoD4pSurn5d0,96702
 not1mm/bandmap.py,sha256=5mANS6F9c11CrEzHD5EL2sTYB_d-ncvRofrLg8bHMP0,26884
-not1mm/checkwindow.py,sha256=xo5iPKtuLnjnwMQJgZ8YBpZpAE_siwsn8ZGLmdrqgyg,5955
+not1mm/checkwindow.py,sha256=gJYc67pMKbxNQMPGJ1PI41nKWGXvG1_H1n9gQRvXsJA,6451
 not1mm/logwindow.py,sha256=DOv2L3wEWzxrIFb5mAg6yaIoW9ejSbcuLN6D5HiLgf8,34331
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=J7Xi62-SF0vO8X1IvQE5O-dESikT6OVmrT_x80F7f4Y,657382
@@ -9,7 +9,7 @@ not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
 not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6u5LUIqAYidOQ,224
 not1mm/data/bandmap.ui,sha256=FB2NaxSK-ZZvfYHU9Mu8FkQxTeVHcFGV40zIqgBXAFo,5246
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
-not1mm/data/checkwindow.ui,sha256=bTL12pHPn28RGApBK5DamLwg1eqtAePt2A7rMzcaPDc,1227
+not1mm/data/checkwindow.ui,sha256=nc4FRc4D3ozC1jhm96Q2y6rolayKF6OwMrbCSaQ-vbg,2572
 not1mm/data/configuration.ui,sha256=-6LKpkTWFuWy9gVBeQ5k3fg5Mw01rwAxp6fQag0E38c,41522
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=0l3wUE5vsc9yknd59ffRLFtAPcnXNl2IaKAmQojGBGI,4667346
@@ -83,7 +83,7 @@ not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=O9i8ypv2W9KZkPAp2bcRI0J5RgPE5R1vMfU8ZGlok_E,379
 not1mm/lib/cat_interface.py,sha256=eKsxC42Mm9wv7E2YQmgL7tLA2Gom-vCVaHHRf2Kitdk,15676
 not1mm/lib/cwinterface.py,sha256=fZ5BXVyF7by0yGTJVznUTjRCxRt3lJaUIsNC-_mCGP4,3123
-not1mm/lib/database.py,sha256=wE95yuMKZDOS_QVxyItzrV8WxAoFwS-zV309r2ojx0w,38549
+not1mm/lib/database.py,sha256=j_AHxc_cW8vyfwmNrqO9DUPW2HnJqtMKKQeqq233A64,40117
 not1mm/lib/edit_contact.py,sha256=YwuX-BuIa7AuPtLRENs4jTzxOrtk6MCxZj3BR_bDPW8,357
 not1mm/lib/edit_macro.py,sha256=lyToZb1nmcONNFh6W35NzYHLU48gbAs2_OsnuRQGHck,559
 not1mm/lib/edit_opon.py,sha256=GqAOJMiC265_4YRVbkT1PflBuCa4HiCNfRhq8-J6ZVY,363
@@ -96,7 +96,7 @@ not1mm/lib/new_contest.py,sha256=mHKNCS3iKOKN-bT9d8ZK3JemThOZFQ0ikfUSS0-ZTpY,354
 not1mm/lib/select_contest.py,sha256=XQdRUkPAIHIMVsilm82M54b_v9yWpYrZ1nfInJrtZoo,363
 not1mm/lib/settings.py,sha256=tkCWgJ3CpNkGR_IyCTOCIlO6PEPZCShHO9FL-9Wono8,6885
 not1mm/lib/super_check_partial.py,sha256=GlXgtIblL602iW-V6Mmdf5S4FxtzJ95TbPMMa9xXUfg,1692
-not1mm/lib/version.py,sha256=NfJFpkXN95Iiyp3XnM8yOFhMtcjiBBJrWKnDDFlCnrQ,46
+not1mm/lib/version.py,sha256=hATNe5bxbwO_Se-Zg1fJdhcw2L9NT4hAiGokiArFTD4,46
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=uV66Mmj6vuNGgY_4PX4lKWvvkyqBQNDf8gAAGTIoKxE,13883
 not1mm/plugins/10_10_spring_cw.py,sha256=yAxvP1fR5vg4cqpADvG0BN-ibjW7lSAcn-p9VzXNW3g,13888
@@ -128,9 +128,9 @@ not1mm/testing/multicast_listener.py,sha256=2CkiyZ4EQxBX68_1QzGIX9g_UB9-CQq63OH-
 not1mm/testing/n1mm_listener.py,sha256=UD-qyKEnppQua330WEFKMvMJaNjnYKi7dDuX_RGB5lQ,1099
 not1mm/testing/test.py,sha256=wGblvMlyOCVkEiHbxE6wvLsorim15ehL72_EZLQeWkk,1660
 testing/test.py,sha256=icT6vZPbJaZWJbEZ09nSbPmTFeiaL7LbXqM_sjhDisI,471
-not1mm-23.8.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.8.5.dist-info/METADATA,sha256=AM3B7rI-zFqC3DmAgSQeWrfHWxIJsX9WJXM6xpLVXKM,23401
-not1mm-23.8.5.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-not1mm-23.8.5.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.8.5.dist-info/top_level.txt,sha256=-NwUrh4k1kzpOvf720xYWSTKSlr-zNSIz3D_eplrxLs,15
-not1mm-23.8.5.dist-info/RECORD,,
+not1mm-23.8.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.8.6.dist-info/METADATA,sha256=nvBHO-Wu4EX-eMTfuwrP4zuRJaqT7aOsIPqWXlT5xPM,23938
+not1mm-23.8.6.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+not1mm-23.8.6.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.8.6.dist-info/top_level.txt,sha256=-NwUrh4k1kzpOvf720xYWSTKSlr-zNSIz3D_eplrxLs,15
+not1mm-23.8.6.dist-info/RECORD,,