not1mm 25.1.27.4__py3-none-any.whl → 25.1.29__py3-none-any.whl

not1mm/bandmap.py

@@ -814,6 +814,7 @@ class BandMapWindow(QDockWidget):
         """Process waiting bytes"""
         while self.socket.bytesAvailable():
             data = self.socket.readLine(1000)
+
             try:
                 data = str(data, "utf-8").strip()
             except UnicodeDecodeError:
@@ -821,14 +822,15 @@ class BandMapWindow(QDockWidget):
 
             if "login:" in data or "call:" in data or "callsign:" in data:
                 self.send_command(self.callsignField.text())
-                self.send_command(self.settings.get("cluster_filter", ""))
-                self.send_command("set dx extension Section")
-                self.send_command(
-                    "set dx mode " + self.settings.get("cluster_mode", "OPEN")
-                )
                 return
+
+            if "password:" in data:
+                self.send_command(self.settings.get("cluster_password", ""))
+                return
+
             if "BEACON" in data:
                 return
+
             if "DX de" in data:
                 parts = data.split()
                 spotter = parts[2]
@@ -848,8 +850,14 @@ class BandMapWindow(QDockWidget):
                 except ValueError:
                     logger.debug(f"couldn't parse freq from datablock {data}")
                 return
-            if self.callsignField.text().upper() in data:
+
+            if "HELLO" in data.upper():
                 self.connectButton.setText("Connected")
+                self.send_command(self.settings.get("cluster_filter", ""))
+                self.send_command("set dx extension Section")
+                self.send_command(
+                    "set dx mode " + self.settings.get("cluster_mode", "OPEN")
+                )
                 logger.debug(f"callsign login acknowledged {data}")
 
     def maybeconnected(self) -> None:

not1mm/data/configuration.ui

@@ -806,20 +806,27 @@
        <string>Cluster</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
-       <item row="5" column="0">
-        <spacer name="horizontalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+       <item row="2" column="1" colspan="2">
+        <widget class="QLineEdit" name="cluster_port_field">
+         <property name="accessibleName">
+          <string>port</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
+         <property name="accessibleDescription">
+          <string>network port of the d x cluster server.</string>
          </property>
-        </spacer>
+        </widget>
        </item>
-       <item row="6" column="1">
+       <item row="4" column="1" colspan="5">
+        <widget class="QLineEdit" name="cluster_filter">
+         <property name="accessibleName">
+          <string>filter</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>cluster filter.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
         <spacer name="verticalSpacer_7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -832,21 +839,18 @@
          </property>
         </spacer>
        </item>
-       <item row="5" column="4">
-        <spacer name="horizontalSpacer_11">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Port:</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-        </spacer>
+        </widget>
        </item>
-       <item row="5" column="3">
-        <spacer name="horizontalSpacer_9">
+       <item row="6" column="0">
+        <spacer name="horizontalSpacer_7">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -858,21 +862,21 @@
          </property>
         </spacer>
        </item>
-       <item row="5" column="5">
-        <spacer name="horizontalSpacer_10">
+       <item row="0" column="1">
+        <spacer name="verticalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>40</width>
-           <height>20</height>
+           <width>20</width>
+           <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="5" column="1">
-        <spacer name="horizontalSpacer_8">
+       <item row="6" column="5">
+        <spacer name="horizontalSpacer_10">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -884,48 +888,51 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="1">
-        <spacer name="verticalSpacer_6">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="4" column="0">
-        <widget class="QLabel" name="label_21">
+        <widget class="QLabel" name="label_20">
          <property name="text">
-          <string>Mode:</string>
+          <string>Filter:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_20">
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_21">
          <property name="text">
-          <string>Filter:</string>
+          <string>Mode:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Port:</string>
+       <item row="6" column="3">
+        <spacer name="horizontalSpacer_9">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
+       </item>
+       <item row="6" column="1">
+        <spacer name="horizontalSpacer_8">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_5">
@@ -937,27 +944,20 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="5">
-        <widget class="QLineEdit" name="cluster_server_field">
-         <property name="accessibleName">
-          <string>server</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>address of d x cluster server.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" colspan="5">
-        <widget class="QLineEdit" name="cluster_filter">
-         <property name="accessibleName">
-          <string>filter</string>
+       <item row="6" column="4">
+        <spacer name="horizontalSpacer_11">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <property name="accessibleDescription">
-          <string>cluster filter.</string>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="4" column="1" colspan="2">
+       <item row="5" column="1" colspan="2">
         <widget class="QComboBox" name="cluster_mode">
          <property name="accessibleName">
           <string>mode</string>
@@ -977,13 +977,33 @@
          </item>
         </widget>
        </item>
-       <item row="2" column="1" colspan="2">
-        <widget class="QLineEdit" name="cluster_port_field">
+       <item row="1" column="1" colspan="5">
+        <widget class="QLineEdit" name="cluster_server_field">
          <property name="accessibleName">
-          <string>port</string>
+          <string>server</string>
          </property>
          <property name="accessibleDescription">
-          <string>network port of the d x cluster server.</string>
+          <string>address of d x cluster server.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_29">
+         <property name="text">
+          <string>Password:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="cluster_password_field">
+         <property name="echoMode">
+          <enum>QLineEdit::EchoMode::Password</enum>
+         </property>
+         <property name="placeholderText">
+          <string>Only If Needed</string>
          </property>
         </widget>
        </item>
@@ -1613,7 +1633,7 @@
         <rect>
          <x>5</x>
          <y>25</y>
-         <width>636</width>
+         <width>639</width>
          <height>376</height>
         </rect>
        </property>

not1mm/lib/settings.py

@@ -164,11 +164,15 @@ class Settings(QtWidgets.QDialog):
             str(self.preference.get("cluster_server", "dxc.nc7j.com"))
         )
         self.cluster_port_field.setText(str(self.preference.get("cluster_port", 7373)))
+        self.cluster_password_field.setText(
+            str(self.preference.get("cluster_password", ""))
+        )
         self.cluster_filter.setText(self.preference.get("cluster_filter", ""))
         value = self.preference.get("cluster_mode", "")
         index = self.cluster_mode.findText(value)
         if index != -1:
             self.cluster_mode.setCurrentIndex(index)
+
         self.activate_160m.setChecked(bool("160" in self.preference.get("bands", [])))
         self.activate_80m.setChecked(bool("80" in self.preference.get("bands", [])))
         self.activate_60m.setChecked(bool("60" in self.preference.get("bands", [])))
@@ -277,7 +281,11 @@ class Settings(QtWidgets.QDialog):
         self.preference["n1mm_lookupport"] = self.n1mm_lookupport.text()
         self.preference["n1mm_scoreport"] = self.n1mm_scoreport.text()
         self.preference["cluster_server"] = self.cluster_server_field.text()
-        self.preference["cluster_port"] = int(self.cluster_port_field.text())
+        try:
+            self.preference["cluster_port"] = int(self.cluster_port_field.text())
+        except:
+            ...
+        self.preference["cluster_password"] = self.cluster_password_field.text()
         self.preference["cluster_filter"] = self.cluster_filter.text()
         self.preference["cluster_mode"] = self.cluster_mode.currentText()
         bandlist = list()

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.1.27.4"
+__version__ = "25.1.29"

{not1mm-25.1.27.4.dist-info → not1mm-25.1.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.1.27.4
+Version: 25.1.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-1-29] Add password field for cluster signin.
 - [25-1-27-3] Add ft8 adif parser to the general logger.
 - [25-1-27-1] Add LABRE-RS Digi
 - [25-1-27] Update pop up about updates...

{not1mm-25.1.27.4.dist-info → not1mm-25.1.29.dist-info}/RECORD

@@ -1,6 +1,6 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/__main__.py,sha256=g0o9K_koq2alfJffLvSYAEB_jjRetCfy1ZyjsSe6-vw,147224
-not1mm/bandmap.py,sha256=BpaR8ENrDJyyPBDeNiHrNYGPU6vRNMoCl2J8HBx4FtE,31137
+not1mm/bandmap.py,sha256=vaOeqv_gW0-K0P3xA9JYcuiFILiKw601tjHQCwuoV-s,31260
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
@@ -18,7 +18,7 @@ not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6
 not1mm/data/bandmap.ui,sha256=rh9GHdBOIfrOmamR6zUZ15aJ4VDsX5mQoVuZs8bV8TI,8034
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=PRD98K0julJ9EfWqoE89dT8UPuPKQzGiWBk_efAko3o,5141
-not1mm/data/configuration.ui,sha256=VJv_uJp53mPK6YyVXOu0aRRtgrgFvIha_wX_7P4M9t0,72554
+not1mm/data/configuration.ui,sha256=IvE0IkNdqznfo94qQHvJHQFwrYVxp-5aSbkvKnEesOQ,73234
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=dPG9K1Pm4Rxd4uJom_gQ8y-sbqiZfILpl4kBAFnOveU,4877142
 not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
@@ -114,9 +114,9 @@ not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/plugin_common.py,sha256=M5reDYM-v5IjAa2yTROvZTeTDkXYHb3U52W9mc9GxwA,13213
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=j5lIMLHJ-eqIaVr_QhI82gkbOl17_C-5suRkWbHYET8,14717
+not1mm/lib/settings.py,sha256=9xsf5MbjiPdELq7QtWTpkY-qPH442K3Uc8NVao57fSI,14964
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=-MqFFt7akWpxTXyweUCTaf5mthfhZx52lwmsD2LBaew,50
+not1mm/lib/version.py,sha256=MqGntxoAGmOzNzEEaay0_uDA_SAhUe3g2GEGLUU96d4,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -166,9 +166,9 @@ not1mm/plugins/ref_ssb.py,sha256=Z_XmMpYKcI5dZh4TQqvQDcz-cLpMzpDEKBnb5iHeBLQ,215
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=rdlIrsxBeuj-RQc5OStVNF7sGCtBK5t6inN5Z7DI4tw,20066
 not1mm/plugins/winter_field_day.py,sha256=JK4r1vfxs7aADR7ZYbjZniz3f5s3_ipSQDZ0GRNWC7I,15222
-not1mm-25.1.27.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.1.27.4.dist-info/METADATA,sha256=8xHtejN4_fT7125J3WrgV0_cL7bU9NHpyDBJ41-Z7-w,36094
-not1mm-25.1.27.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-not1mm-25.1.27.4.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.1.27.4.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.1.27.4.dist-info/RECORD,,
+not1mm-25.1.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.1.29.dist-info/METADATA,sha256=1od78yzIlRAfE8C38_Ff6gFzBTnpn8NI4s9iDwKogB0,36143
+not1mm-25.1.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+not1mm-25.1.29.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.1.29.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.1.29.dist-info/RECORD,,