PyFT8 2.12.2__tar.gz → 2.12.3__tar.gz

{pyft8-2.12.2 → pyft8-2.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.12.2
+Version: 2.12.3
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -48,13 +48,8 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
  - Data used for the above is cached to disk so is not lost when restarting the program
 
-To enable uploading of spots to pskreporter, make sure that your .ini file includes
-```
-[pskreporter]
-upload = Y
-```
+<img width="997" height="1025" alt="screenshot" src="https://github.com/user-attachments/assets/88228f65-c39e-45ee-9f73-1d85138563f3" />
 
-![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -128,7 +123,8 @@ upload = Y
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-![performance snapshot](performance%20snapshot.png)
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/b62221ec-2d74-4fbc-9c61-34b2bbc0e963" />
+
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.12.2 → pyft8-2.12.3}/PyFT8/databases.py

@@ -2,6 +2,7 @@ from PyFT8.pskreporter import PSKR_MQTT_listener
 import threading, time, os, pickle, json
 
 call_hashes = {}
+
 def add_call_hashes(call):
     global call_hashes
     chars = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/"
@@ -64,16 +65,18 @@ class DiskDict:
         with self.lock:        
             if(os.path.exists(self.file)):
                 with open(f"{self.file}","rb") as f:
-                    self.data = json.load(f)
+                    try:
+                        self.data = json.load(f)
+                    except:
+                        pass
 
     def save(self):
         with self.lock:
-            tmp_file = f"{self.file}.tmp"
-            with open(tmp_file, "w") as f:
-                json.dump(self.data, f)
-                f.flush()
-                os.fsync(f.fileno())
-            os.replace(tmp_file, self.file)
+            with open(self.file, "w") as f:
+                try:
+                    json.dump(self.data, f)
+                except:
+                    pass
 
 class History:
     def __init__(self, config_folder, my_call, home_square, pskr_refresh_mins, parse_all_file):
@@ -83,6 +86,7 @@ class History:
         self.my_call = my_call
         self.home_square = home_square
         self.home_square_lev4 = home_square[:4]
+        self.freqs_to_bands = {}
         self.dist_brg_cache = {}
         self.hearing_me = DiskDict(f"{self.config_folder}/hearing_me.json", 3)   # all-time record of hearing me
         self.heard_by_me = DiskDict(f"{self.config_folder}/heard_by_me.json", 5) # all-time record of heard by me
@@ -102,29 +106,29 @@ class History:
             mqtt = PSKR_MQTT_listener(self.home_square_lev4, self.add_mqtt_spot)
             threading.Thread(target = self.count_activity, daemon = True).start()
 
-    def band_from_MHz(self, fMHz): # rewrite this to use the band button defs from ini file
-        f = int(fMHz)
-        if f > 0:
-            freqs = [1,3,5,7,10,14,18,21,24,28,50,144,433]
-            idx = freqs.index(f) if f in freqs else -1
-            if idx > -1:
-                return ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm'][idx]
-
-    def load_from_wb(self, log_cache):
+    def set_bands(self, bands):
+        for b in bands:
+            f = float(bands[b])
+            self.freqs_to_bands[round(f,1)] = b
+            
+    def load_hearing_heard_from_adif(self, log_cache):
         for key in log_cache:
             key_parts = key.split('_')
             if len(key_parts) > 1:
                 c, b, m = key_parts
                 if m == 'FT8':
+                    #print(f"Parsing adif log: Add hearing & heard by {c} on {b}")
                     self.add_myspots_record(self.hearing_me.data, None, b, c, 0, 0)
                     self.add_myspots_record(self.heard_by_me.data, None, b, c, 0, 0)
+                else:
+                    print(m)
 
     def load_all_file(self, all_file):
         recs = self.parse_all_txt(all_file)
         if not any(recs): return
         for r in recs:
             if r['md'] == 'FT8':
-                band = self.band_from_MHz(r['fMHz'])
+                band = self.freqs_to_bands.get(round(r['fMHz'], 1), None)
                 if band is not None:
                     TxRx = 'Tx' if (r['TxRx'] == 'Tx' or r['call_b'] == self.my_call) else 'Rx'
                     call = r['call_b'] if TxRx == 'Rx' else r['call_a']
@@ -298,6 +302,10 @@ class ADIF:
         import calendar
         def parse(rec, field):
             p = rec.find(field)
+            if p<0:
+                p = rec.find(field.upper())
+            if p<0:
+                p = rec.find(field.lower())
             if p > 0:
                 p1, p2 = rec.find(':',p), rec.find('>',p)
                 n = int(rec[p1+1:p2])
@@ -307,8 +315,9 @@ class ADIF:
             for l in f.readlines():
                 if parse(l, 'mode') == "FT8":
                     c, b, d, t = parse(l, 'call'), parse(l, 'band'), parse(l, 'qso_date'), parse(l, 'time_on')
-                    time_tuple = time.strptime(d+t, "%Y%m%d%H%M%S")
-                    tm = calendar.timegm(time_tuple)
-                    cache[c] = tm
-                    cache[c + "_"+b+"_FT8"] = tm
+                    if c and b and d and t:
+                        time_tuple = time.strptime(d+t, "%Y%m%d%H%M%S")
+                        tm = calendar.timegm(time_tuple)
+                        cache[c] = tm
+                        cache[c + "_"+b+"_FT8"] = tm
         return cache

{pyft8-2.12.2 → pyft8-2.12.3}/PyFT8/pyft8.py

@@ -12,7 +12,7 @@ from PyFT8.time_utils import global_time_utils
 from PyFT8.rigctrl import Rig_CAT, Rig_hamlib
 from PyFT8.databases import History, ADIF
 
-VER = '2.12.2'
+VER = '2.12.3'
 
 MAX_TX_START_SECONDS = 2.5
 HEARING_PANEL_LIFE_MINS = 5
@@ -57,7 +57,7 @@ class Message:
             mycall = qso.mStation['c']
         self.h0_idx, self.f0_idx, self.msg_tuple, self.msg, self.snr, self.dt, self.fHz = c.h0_idx, c.f0_idx, c.msg_tuple, c.msg, c.snr, c.dt, c.fHz
         self.cyclestart = c.cyclestart
-        self.expire = time.time() + 29.8
+        self.expire = time.time() + 29.25
         self.is_from_me = c.msg_tuple[1] == mycall
         self.is_to_me = c.msg_tuple[0] == mycall
         self.is_cq = c.msg_tuple[0].startswith('CQ')
@@ -378,8 +378,9 @@ def cli():
     if not args.no_gui:
         gui = Gui(audio_in.dBgrid_main, 4, 2, config, on_gui_sidebars_refresh, on_gui_msg_click, on_gui_control_click)
         history = History(config_folder, mc, mg, PSKR_REFRESH_MINS, args.parse_all_file)
+        history.set_bands(config['bands'])
         adif_logging = ADIF(f"{config_folder}/PyFT8.adi")
-        history.load_from_wb(adif_logging.cache)
+        history.load_hearing_heard_from_adif(adif_logging.cache)
 
     if mc is not None and 'pskreporter' in config.keys():
         if config['pskreporter']['upload'] == 'Y':

{pyft8-2.12.2 → pyft8-2.12.3}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.12.2
+Version: 2.12.3
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -48,13 +48,8 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
  - Data used for the above is cached to disk so is not lost when restarting the program
 
-To enable uploading of spots to pskreporter, make sure that your .ini file includes
-```
-[pskreporter]
-upload = Y
-```
+<img width="997" height="1025" alt="screenshot" src="https://github.com/user-attachments/assets/88228f65-c39e-45ee-9f73-1d85138563f3" />
 
-![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -128,7 +123,8 @@ upload = Y
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-![performance snapshot](performance%20snapshot.png)
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/b62221ec-2d74-4fbc-9c61-34b2bbc0e963" />
+
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.12.2 → pyft8-2.12.3}/README.md

@@ -29,13 +29,8 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
  - Data used for the above is cached to disk so is not lost when restarting the program
 
-To enable uploading of spots to pskreporter, make sure that your .ini file includes
-```
-[pskreporter]
-upload = Y
-```
+<img width="997" height="1025" alt="screenshot" src="https://github.com/user-attachments/assets/88228f65-c39e-45ee-9f73-1d85138563f3" />
 
-![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -109,7 +104,8 @@ upload = Y
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-![performance snapshot](performance%20snapshot.png)
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/b62221ec-2d74-4fbc-9c61-34b2bbc0e963" />
+
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.12.2 → pyft8-2.12.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyFT8"
-version = "2.12.2"
+version = "2.12.3"
 license = "GPL-3.0-or-later"
 
 authors = [