not1mm 25.6.16.1__py3-none-any.whl → 25.6.18__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. not1mm/__main__.py +1 -1
  2. not1mm/lib/lookup.py +36 -25
  3. not1mm/lib/version.py +1 -1
  4. not1mm/lookupservice.py +9 -8
  5. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/METADATA +1 -1
  6. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/RECORD +10 -10
  7. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/WHEEL +0 -0
  8. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/entry_points.txt +0 -0
  9. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/licenses/LICENSE +0 -0
  10. {not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/top_level.txt +0 -0
not1mm/__main__.py CHANGED
@@ -3399,7 +3399,7 @@ class MainWindow(QtWidgets.QMainWindow):
3399
3399
  return
3400
3400
  self.cw.sendcw(self.process_macro(function_key.toolTip()))
3401
3401
  # if self.pref.get("cwtype") == 2:
3402
- time.sleep(0.3)
3402
+ # time.sleep(0.3)
3403
3403
  # return
3404
3404
 
3405
3405
  def toggle_run_sp(self) -> None:
not1mm/lib/lookup.py CHANGED
@@ -74,27 +74,30 @@ class HamDBlookup:
74
74
  if root:
75
75
  messages = root.get("messages")
76
76
  callsign = root.get("callsign")
77
- if messages:
78
- error_text = messages.get("status")
79
- logger.debug("HamDB: %s", error_text)
80
- if error_text != "OK":
81
- self.error = False
82
- if callsign:
83
- logger.debug("HamDB: found callsign field")
84
- if callsign.get("grid"):
85
- grid = callsign.get("grid")
86
- if callsign.get("fname"):
87
- name = callsign.get("fname")
88
- if callsign.get("name"):
89
- if not name:
90
- name = callsign.get("name")
91
- else:
92
- name = f"{name} {callsign.get('name')}"
93
- if callsign.get("nickname"):
94
- nickname = callsign.get("nickname")
77
+ if messages is not None:
78
+ error_text = messages.get("status")
79
+ logger.debug("HamDB: %s", error_text)
80
+ if error_text != "OK":
81
+ self.error = False
82
+ if callsign is not None:
83
+ logger.debug("HamDB: found callsign field")
84
+ if callsign.get("grid"):
85
+ grid = callsign.get("grid")
86
+ if callsign.get("fname"):
87
+ name = callsign.get("fname")
88
+ if callsign.get("name"):
89
+ if not name:
90
+ name = callsign.get("name")
91
+ else:
92
+ name = f"{name} {callsign.get('name')}"
93
+ if callsign.get("nickname"):
94
+ nickname = callsign.get("nickname")
95
95
  else:
96
96
  self.error = True
97
97
  error_text = str(query_result.status_code)
98
+ logger.critical(
99
+ "HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text
100
+ )
98
101
  logger.info("HamDB-lookup: %s %s %s %s", grid, name, nickname, error_text)
99
102
  return grid, name, nickname, error_text
100
103
 
@@ -166,12 +169,20 @@ class QRZlookup:
166
169
  )
167
170
 
168
171
  logger.info("\n\n%s\n\n", root)
169
- logger.info(
170
- "key:%s error:%s message:%s",
171
- self.session,
172
- self.error,
173
- self.message,
174
- )
172
+ if self.error:
173
+ logger.critical(
174
+ "key:%s error:%s message:%s",
175
+ self.session,
176
+ self.error,
177
+ self.message,
178
+ )
179
+ else:
180
+ logger.info(
181
+ "key:%s error:%s message:%s",
182
+ self.session,
183
+ self.error,
184
+ self.message,
185
+ )
175
186
  except requests.exceptions.RequestException as exception:
176
187
  logger.info("%s", exception)
177
188
  self.session = False
@@ -209,7 +220,7 @@ class QRZlookup:
209
220
  )
210
221
  baseroot = xmltodict.parse(query_result.text)
211
222
  root = baseroot.get("QRZDatabase", {})
212
- return root.get("Callsign")
223
+ return root.get("Callsign", {})
213
224
 
214
225
 
215
226
  class HamQTH:
not1mm/lib/version.py CHANGED
@@ -1,3 +1,3 @@
1
1
  """It's the version"""
2
2
 
3
- __version__ = "25.6.16.1"
3
+ __version__ = "25.6.18"
not1mm/lookupservice.py CHANGED
@@ -40,14 +40,14 @@ class LookupService(QDockWidget):
40
40
 
41
41
  if self.settings.get("useqrz"):
42
42
  self.look_up = QRZlookup(
43
- self.settings.get("lookupusername"),
44
- self.settings.get("lookuppassword"),
43
+ self.settings.get("lookupusername", ""),
44
+ self.settings.get("lookuppassword", ""),
45
45
  )
46
46
 
47
47
  if self.settings.get("usehamqth"):
48
48
  self.look_up = HamQTH(
49
- self.settings.get("lookupusername"),
50
- self.settings.get("lookuppassword"),
49
+ self.settings.get("lookupusername", ""),
50
+ self.settings.get("lookuppassword", ""),
51
51
  )
52
52
 
53
53
  def get_settings(self) -> dict:
@@ -55,6 +55,7 @@ class LookupService(QDockWidget):
55
55
  if os.path.exists(fsutils.CONFIG_FILE):
56
56
  with open(fsutils.CONFIG_FILE, "rt", encoding="utf-8") as file_descriptor:
57
57
  return loads(file_descriptor.read())
58
+ return {}
58
59
 
59
60
  def msg_from_main(self, packet):
60
61
  """"""
@@ -74,12 +75,12 @@ class LookupService(QDockWidget):
74
75
  self.look_up = None
75
76
  if self.settings.get("useqrz"):
76
77
  self.look_up = QRZlookup(
77
- self.settings.get("lookupusername"),
78
- self.settings.get("lookuppassword"),
78
+ self.settings.get("lookupusername", ""),
79
+ self.settings.get("lookuppassword", ""),
79
80
  )
80
81
 
81
82
  if self.settings.get("usehamqth"):
82
83
  self.look_up = HamQTH(
83
- self.settings.get("lookupusername"),
84
- self.settings.get("lookuppassword"),
84
+ self.settings.get("lookupusername", ""),
85
+ self.settings.get("lookuppassword", ""),
85
86
  )
{not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: not1mm
3
- Version: 25.6.16.1
3
+ Version: 25.6.18
4
4
  Summary: NOT1MM Logger
5
5
  Author-email: Michael Bridak <michael.bridak@gmail.com>
6
6
  License: GPL-3.0-or-later
{not1mm-25.6.16.1.dist-info → not1mm-25.6.18.dist-info}/RECORD RENAMED
@@ -1,11 +1,11 @@
1
1
  not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
2
- not1mm/__main__.py,sha256=SgbLlUVWGbXy00ThKA_61ApJobDaazLfGabsfo3Mpkg,174828
2
+ not1mm/__main__.py,sha256=x-MFQjObG-GRtx3OrTLvdqUtj6qCQhGfw69myPdWZVU,174830
3
3
  not1mm/bandmap.py,sha256=PpoZIuJ8dTj9erW0xYqbyneZrSQ-CEqbpek5jTlc6PQ,31173
4
4
  not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
5
5
  not1mm/dxcc_tracker.py,sha256=px1m6wcFv-ZDBDKyqSa0IcgAfE9GmQ5mptJHBbnWTcA,4379
6
6
  not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
7
7
  not1mm/logwindow.py,sha256=O2dMaT_BYWsXA_dxsEHN92JwN-qVGy9nmH0MCMaG9gY,42830
8
- not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
8
+ not1mm/lookupservice.py,sha256=WyLp1m4XPxK0Nk7FH8IKA8jjAs25UcEMrwpCsHmW1fY,2678
9
9
  not1mm/radio.py,sha256=4Lysf9BY3vdtYCHwKfzO5WN7IGyh4_lKSVuQ6F4Z08g,5536
10
10
  not1mm/ratewindow.py,sha256=iBjqdOetIEX0wSwdGM89Ibt4gVlFdE-K8HQPnkVPVOg,6965
11
11
  not1mm/rotator.py,sha256=jrAqO3IkeuZcOgsYFKvEv6DY2ccV85wg0o5sdJa_EUo,12760
@@ -117,7 +117,7 @@ not1mm/lib/edit_station.py,sha256=hUpqNgboNqhpFzHzjQI0FI8GId6muECRsaXaphN02kQ,19
117
117
  not1mm/lib/fldigi_sendstring.py,sha256=EeXSBRKgyUEzNyHBjMtHiFe-iOU3TcWcCCX77t0ur_I,602
118
118
  not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
119
119
  not1mm/lib/ham_utility.py,sha256=7vsnk_nPAOHoP5XhMCDX6ll0F8Sm9XOI-DFMjB80ZFI,12105
120
- not1mm/lib/lookup.py,sha256=KECMDi9tflRDzgTLeDfDl7HGWWRHvW3HCjNHyyjoWaY,10835
120
+ not1mm/lib/lookup.py,sha256=k-BctngA0QEvMo5cPDB9UkUnQvIk69LnJ8bJek2So4U,11326
121
121
  not1mm/lib/multicast.py,sha256=KJcruI-bOuHfHXPjl3SGQhL6I9sKrygy-sdFSvxffUM,3255
122
122
  not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
123
123
  not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
@@ -126,7 +126,7 @@ not1mm/lib/rot_interface.py,sha256=bOyxpV9pQHORUY5qfNZE2QAV1V71QEG2jooiI2p9AwE,3
126
126
  not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
127
127
  not1mm/lib/settings.py,sha256=5xnsagH48qGeCDhfxPWW9yaXtv8wT13yoIVvYt8h_Qs,16023
128
128
  not1mm/lib/super_check_partial.py,sha256=jX7DjHesEV4KNVQbddJui0wAsYHerikH7W0iPv7PXQw,3110
129
- not1mm/lib/version.py,sha256=BXK9rv-j6m1DJFcBBrHMRMEUyr4cZvhrOSpryaAtg4w,50
129
+ not1mm/lib/version.py,sha256=_cATCfKk86Qu0minHCVwH0MHncGCnfM-td04TnLn7Dk,48
130
130
  not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
131
131
  not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
132
132
  not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -190,9 +190,9 @@ not1mm/plugins/ukeidx.py,sha256=ZsIFXgOSwjuKNmN4W_C0TAgGqgnabJGNLMHwGkl3_bk,1910
190
190
  not1mm/plugins/vhf_sprint.py,sha256=a9QFTpv8XUbZ_GLjdVCh7svykFa-gXOWwKFZ6MD3uQM,19289
191
191
  not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
192
192
  not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
193
- not1mm-25.6.16.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
194
- not1mm-25.6.16.1.dist-info/METADATA,sha256=TbPB3A5sopjzK7eOR4K0wDJO3lZSvBi6K5YCzFIg15A,36874
195
- not1mm-25.6.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
196
- not1mm-25.6.16.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
197
- not1mm-25.6.16.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
198
- not1mm-25.6.16.1.dist-info/RECORD,,
193
+ not1mm-25.6.18.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
194
+ not1mm-25.6.18.dist-info/METADATA,sha256=SABeYaq2mW8kBnnvU-okd176v3goLOiu87ESvTmcEOk,36872
195
+ not1mm-25.6.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
196
+ not1mm-25.6.18.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
197
+ not1mm-25.6.18.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
198
+ not1mm-25.6.18.dist-info/RECORD,,