not1mm 25.5.22__py3-none-any.whl → 25.5.26__py3-none-any.whl

not1mm/__main__.py

@@ -17,6 +17,7 @@ import locale
 import logging
 from logging.handlers import RotatingFileHandler
 import os
+import queue
 import socket
 import sys
 import uuid
@@ -40,6 +41,7 @@ from not1mm.lib.database import DataBase
 from not1mm.lib.edit_macro import EditMacro
 from not1mm.lib.edit_opon import OpOn
 from not1mm.lib.edit_station import EditStation
+from not1mm.lib.multicast import Multicast
 from not1mm.lib.ham_utility import (
     bearing,
     bearing_with_latlon,
@@ -187,6 +189,10 @@ class MainWindow(QtWidgets.QMainWindow):
     lookup_service = None
     fldigi_util = None
     rtc_service = None
+    rtc_interval = 2
+    rtc_user = ""
+    rtc_url = ""
+    rtc_pass = ""
 
     current_widget = None
 
@@ -195,6 +201,8 @@ class MainWindow(QtWidgets.QMainWindow):
     auto_cq_time = datetime.datetime.now()
     auto_cq_delay = 15000
 
+    server_commands = []
+
     def __init__(self, splash):
         super().__init__()
         logger.info("MainWindow: __init__")
@@ -214,8 +222,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         self.fontfamily = self.load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
         uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
+
         if sys.platform == "darwin":
-            def_font_size = 12
+            QApplication.setStyle("Fusion")
+            def_font_size = 13
 
             QApplication.instance().setFont(QFont(self.fontfamily, def_font_size))
             self.F1.setFont(QFont(self.fontfamily, def_font_size))
@@ -257,7 +267,10 @@ class MainWindow(QtWidgets.QMainWindow):
             self.dark_watcher
         )
         self.dark_watcher(QApplication.instance().styleHints().colorScheme())
-
+        self.udp_fifo = queue.Queue()
+        self.server_message_watch_timer = QtCore.QTimer()
+        self.server_message_watch_timer.timeout.connect(self.check_udp_queue)
+        self.server_message_watch_timer.start(1000)
         self.inputs_dict = {
             self.callsign: "callsign",
             self.sent: "sent",
@@ -270,6 +283,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.cwprogressBar.hide()
         self.rightdot.hide()
         self.n1mm = N1MM()
+        self.server_channel = Multicast(
+            multicast_group="239.1.1.1", multicast_port=2239, interface_ip="0.0.0.0"
+        )
+        self.server_channel.ready_read_connect(self.server_message)
         self.ft8 = FT8Watcher()
         self.ft8.set_callback(None)
         self.mscp = SCP(fsutils.APP_DATA_PATH)
@@ -346,6 +363,8 @@ class MainWindow(QtWidgets.QMainWindow):
         icon_path = fsutils.APP_DATA_PATH
         self.greendot = QtGui.QPixmap(str(icon_path / "greendot.png"))
         self.reddot = QtGui.QPixmap(str(icon_path / "reddot.png"))
+        self.redserver = QtGui.QPixmap(str(icon_path / "cloud_red.png"))
+        self.greenserver = QtGui.QPixmap(str(icon_path / "cloud_green.png"))
         self.leftdot.setPixmap(self.greendot)
         self.rightdot.setPixmap(self.reddot)
 
@@ -621,7 +640,7 @@ class MainWindow(QtWidgets.QMainWindow):
             ) as c_file:
                 self.ctyfile = loads(c_file.read())
         except (IOError, JSONDecodeError, TypeError):
-            logging.CRITICAL("There was an error parsing the BigCity file.")
+            logging.critical("There was an error parsing the BigCity file.")
 
         self.show_splash_msg("Starting LookUp Service.")
 
@@ -629,6 +648,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.lookup_service.message.connect(self.dockwidget_message)
         self.lookup_service.hide()
 
+        self.server_seen = datetime.datetime.now()
+
         self.show_splash_msg("Reading preferences.")
         self.readpreferences()
 
@@ -671,7 +692,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if int(x[0]) >= 6 and int(x[1]) >= 8:
                 old_Qt = False
 
-        # Featureset for wayland if pyqt is older that 6.8
+        # Featureset for wayland if pyqt is older than 6.8
         dockfeatures = (
             QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
@@ -798,7 +819,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if VersionTest(__version__).test():
                 self.show_message_box(
                     "There is a newer version of not1mm available.\n"
-                    "You can udate to the current version by using:\n\n"
+                    "You can update to the current version by using:\n\n"
                     "pip install -U not1mm\n\tor\n"
                     "pipx upgrade not1mm"
                 )
@@ -809,6 +830,146 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         logger.info(f"bind {b_result}")
         self.udp_socket.readyRead.connect(self.fldigi_on_udp_socket_ready_read)
+        self.resolve_dirty_records()
+
+    # Server stuff
+
+    def resolve_dirty_records(self):
+        """Go through dirty records and submit them to the server."""
+        if self.pref.get("useserver", False) is True and hasattr(self, "database"):
+            records = self.database.fetch_all_dirty_contacts()
+            print(f"Resolving {len(records)} unsent contacts.\n")
+            if records:
+                for contact in records:
+                    contact["cmd"] = "POST"
+                    stale = datetime.datetime.now() + datetime.timedelta(seconds=30)
+                    contact["expire"] = stale.isoformat()
+
+                    self.server_commands.append(contact)
+                    self.server_channel.send_as_json(contact)
+
+                    time.sleep(0.1)  # Do I need this?
+                    print(".")
+
+    def clear_dirty_flag(self, unique_id):
+        """clear the dirty flag on record once response is returned from server."""
+        self.database.clear_dirty_flag(unique_id)
+        # show_dirty_records()
+
+    def remove_confirmed_commands(self, data):
+        """Removed confirmed commands from the sent commands list."""
+        for index, item in enumerate(self.server_commands):
+            print(f"Server Commands: {item=} {data=}")
+            if item.get("ID") == data.get("unique_id") and item.get("cmd") == data.get(
+                "subject"
+            ):
+                self.server_commands.pop(index)
+                self.clear_dirty_flag(data.get("unique_id"))
+                print(f"Confirmed {data.get('subject')}")
+
+    def check_for_stale_commands(self):
+        """
+        Check through server commands to see if there has not been a reply in 30 seconds.
+        Resubmits those that are stale.
+        """
+        if self.pref.get("useserver", False) is True:
+            for index, item in enumerate(self.server_commands):
+                expired = datetime.datetime.strptime(
+                    item.get("expire"), "%Y-%m-%dT%H:%M:%S.%f"
+                )
+                if datetime.datetime.now() > expired:
+                    newexpire = datetime.datetime.now() + datetime.timedelta(seconds=30)
+                    self.server_commands[index]["expire"] = newexpire.isoformat()
+                    try:
+                        self.server_channel.send_as_json(self.server_commands[index])
+                    except OSError as err:
+                        logging.warning("%s", err)
+
+    def server_message(self):
+        msg = self.server_channel.getpacket()
+        if msg:
+            self.udp_fifo.put(msg)
+
+    def check_udp_queue(self):
+        """checks the UDP datagram queue."""
+
+        self.check_for_stale_commands()
+        while not self.udp_fifo.empty():
+            datagram = self.udp_fifo.get()
+            try:
+                json_data = loads(datagram.decode())
+            except UnicodeDecodeError as err:
+                the_error = f"Not Unicode: {err}\n{datagram}"
+                logger.info(the_error)
+                continue
+            except JSONDecodeError as err:
+                the_error = f"Not JSON: {err}\n{datagram}"
+                logger.info(the_error)
+                continue
+            logger.info("%s", json_data)
+
+            if json_data.get("cmd") == "PING":
+                # print(f"Got {json_data.get('cmd')} {json_data=}")
+                # if json_data.get("station"):
+                #     band_mode = f"{json_data.get('band')} {json_data.get('mode')}"
+                #     if self.people.get(json_data.get("station")) != band_mode:
+                #         self.people[json_data.get("station")] = band_mode
+                #     self.show_people()
+                if json_data.get("host"):
+                    self.server_seen = datetime.datetime.now() + datetime.timedelta(
+                        seconds=15
+                    )
+                    self.server_icon.setPixmap(self.greenserver)
+                continue
+
+            if json_data.get("cmd") == "RESPONSE":
+                if json_data.get("recipient") == socket.gethostname():
+                    if json_data.get("subject") == "HOSTINFO":
+                        # self.groupcall = json_data.get("groupcall", "")
+                        # self.myclassEntry.setText(str(json_data.get("groupclass", "")))
+                        # self.mysectionEntry.setText(
+                        #     str(json_data.get("groupsection", ""))
+                        # )
+                        # self.group_call_indicator.setText(self.groupcall.center(14))
+                        # self.changemyclass()
+                        # self.changemysection()
+                        # self.mycallEntry.hide()
+                        # self.server_seen = datetime.now() + timedelta(seconds=30)
+                        # self.group_call_indicator.setStyleSheet(
+                        #     "border: 1px solid green;"
+                        # )
+                        return
+                    if json_data.get("subject") == "LOG":
+                        ...
+                        # self.infoline.setText("Server Generated Log.")
+
+                    if json_data.get("subject") == "DUPE":
+                        ...
+                        # if json_data.get("isdupe") != 0:
+                        #     if json_data.get("contact") == self.callsign_entry.text():
+                        #         self.flash()
+                        #         self.infobox.setTextColor(QtGui.QColor(245, 121, 0))
+                        #         self.infobox.insertPlainText(
+                        #             f"{json_data.get('contact')}: " "Server DUPE\n"
+                        #         )
+                    if json_data.get("subject") == "POST":
+                        self.remove_confirmed_commands(json_data)
+                    if json_data.get("subject") == "DELETE":
+                        self.remove_confirmed_commands(json_data)
+                    if json_data.get("subject") == "CONTACTCHANGED":
+                        self.remove_confirmed_commands(json_data)
+
+                continue
+
+            if json_data.get("cmd") == "CHAT":
+                print(f"Got {json_data.get('cmd')} {json_data=}")
+                # self.display_chat(json_data.get("sender"), json_data.get("message"))
+                continue
+
+            if json_data.get("cmd") == "GROUPQUERY":
+                print(f"Got {json_data.get('cmd')} {json_data=}")
+                # if self.groupcall:
+                #     self.send_status_udp()
 
     def fldigi_on_udp_socket_ready_read(self):
         """"""
@@ -936,9 +1097,35 @@ class MainWindow(QtWidgets.QMainWindow):
         QCoreApplication.processEvents()
 
     def dockwidget_message(self, msg):
-        """signal from bandmap"""
+        """incomming signals from widgets"""
         if msg:
+            # Pass delete message from log window to server.
+            if msg.get("cmd", "") == "DELETED":
+                if self.pref.get("useserver", False) is True:
+                    stale = datetime.datetime.now() + datetime.timedelta(seconds=30)
+                    msg["cmd"] = "DELETE"
+                    msg["expire"] = stale.isoformat()
+                    msg["station"] = socket.gethostname()
+                    msg["unique_id"] = msg.get("ID")
+                    self.server_commands.append(msg)
+                    try:
+                        self.server_channel.send_as_json(msg)
+                    except OSError as err:
+                        logging.warning("%s", err)
+
             if msg.get("cmd", "") == "CONTACTCHANGED":
+                if self.pref.get("useserver", False) is True:
+                    stale = datetime.datetime.now() + datetime.timedelta(seconds=30)
+                    msg["expire"] = stale.isoformat()
+                    msg["station"] = socket.gethostname()
+                    msg["unique_id"] = msg.get("ID")
+                    self.server_commands.append(msg)
+                    try:
+                        self.server_channel.send_as_json(msg)
+                    except OSError as err:
+                        logging.warning("%s", err)
+
+            if msg.get("cmd", "") in ["CONTACTCHANGED", "DELETE"]:
                 if self.statistics_window:
                     self.statistics_window.msg_from_main(msg)
             if msg.get("cmd", "") == "GETCOLUMNS":
@@ -1815,11 +2002,11 @@ class MainWindow(QtWidgets.QMainWindow):
                     ) as ctyfile:
                         self.ctyfile = loads(ctyfile.read())
                 except (IOError, JSONDecodeError, TypeError) as err:
-                    logging.CRITICAL(
+                    logging.critical(
                         f"There was an error {err} parsing the BigCity file."
                     )
             else:
-                self.show_message_box("An Error occured updating file.")
+                self.show_message_box("An Error occurred updating file.")
         else:
             self.show_message_box("CTY file is up to date.")
 
@@ -2660,6 +2847,17 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.n1mm.send_contact_info()
 
         self.database.log_contact(self.contact)
+        if self.pref.get("useserver", False) is True:
+            stale = datetime.datetime.now() + datetime.timedelta(seconds=30)
+            self.contact["cmd"] = "POST"
+            self.contact["expire"] = stale.isoformat()
+            self.server_commands.append(self.contact)
+            # bytesToSend = bytes(dumps(self.contact), encoding="ascii")
+            try:
+                self.server_channel.send_as_json(self.contact)
+                # server_udp.sendto(bytesToSend, (multicast_group, int(multicast_port)))
+            except OSError as err:
+                logging.warning("%s", err)
         self.worked_list = self.database.get_calls_and_bands()
         self.send_worked_list()
         self.clearinputs()
@@ -2908,6 +3106,8 @@ class MainWindow(QtWidgets.QMainWindow):
         next_serial = str(result.get("serial_nr", "1"))
         if next_serial == "None":
             next_serial = "1"
+        result = self.database.get_last_serial()
+        prev_serial = str(result.get("serial_nr", "1")).zfill(3)
         macro = macro.upper()
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace(
@@ -2927,6 +3127,9 @@ class MainWindow(QtWidgets.QMainWindow):
             macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
         else:
             macro = macro.replace("{SNT}", self.sent.text())
+        macro = macro.replace(
+            "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
+        )
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace(
                 "{SENTNR}",
@@ -2937,11 +3140,19 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.pref.get("cwpaddingchar", "T"),
                 ),
             )
+            macro = macro.replace(
+                "{PREVNR}",
+                str(prev_serial)
+                .lstrip("0")
+                .rjust(
+                    self.pref.get("cwpaddinglength", 3),
+                    self.pref.get("cwpaddingchar", "T"),
+                ),
+            )
         else:
             macro = macro.replace("{SENTNR}", self.other_1.text())
-        macro = macro.replace(
-            "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
-        )
+            macro = macro.replace("{PREVNR}", str(prev_serial))
+
         if "{LOGIT}" in macro:
             macro = macro.replace("{LOGIT}", "")
             self.save_contact()
@@ -3373,6 +3584,12 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.update_rtc_xml()
 
+        if self.pref.get("useserver", False) is True:
+            self.server_icon.show()
+            self.server_icon.setPixmap(self.redserver)
+        else:
+            self.server_icon.hide()
+
     def rtc_response(self, response):
         print(f"{response=}")
 
@@ -3948,6 +4165,8 @@ class MainWindow(QtWidgets.QMainWindow):
                     milliseconds=self.auto_cq_delay
                 )
                 self.process_function_key(self.F1)
+            if datetime.datetime.now() > self.server_seen:
+                self.server_icon.setPixmap(self.redserver)
 
         # The following pertains to radio polling.
         logger.debug(f"{the_dict=}")

not1mm/bandmap.py

@@ -19,7 +19,7 @@ from decimal import Decimal
 from json import loads
 
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
-from PyQt6.QtGui import QColorConstants, QPalette, QColor, QFont
+from PyQt6.QtGui import QColorConstants, QFont, QColor, QFont
 from PyQt6.QtWidgets import QDockWidget
 from PyQt6.QtCore import Qt, pyqtSignal
 
@@ -357,7 +357,9 @@ class BandMapWindow(QDockWidget):
         self.zoomoutButton.clicked.connect(self.inc_zoom)
         self.connectButton.clicked.connect(self.connect)
         self.spots = Database()
+        self.font = QFont("JetBrains Mono ExtraLight", 10)
         self.bandmap_scene = QtWidgets.QGraphicsScene()
+        self.bandmap_scene.setFont(self.font)
         self.socket = QtNetwork.QTcpSocket()
         self.socket.readyRead.connect(self.receive)
         self.socket.connected.connect(self.maybeconnected)
@@ -563,11 +565,12 @@ class BandMapWindow(QDockWidget):
         self.clear_freq_mark(self.txMark)
         self.clear_freq_mark(self.bandwidth_mark)
         self.bandmap_scene.clear()
-
+        self.bandmap_scene.setFont(self.font)
         step, _digits = self.determine_step_digits()
         steps = int(round((self.currentBand.end - self.currentBand.start) / step))
         self.graphicsView.setFixedSize(330, steps * PIXELSPERSTEP + 30)
         self.graphicsView.setScene(self.bandmap_scene)
+        self.graphicsView.setFont(self.font)
         for i in range(steps):  # Draw tickmarks
             length = 10
             if i % 5 == 0:
@@ -704,8 +707,27 @@ class BandMapWindow(QDockWidget):
 
         entity = ""
         if result:
+            # ⌾ ⦿ 🗼 ⛯ ⊕ ⊞ ⁙ ⁘ ⁕ ⌖ Ⓟ ✦ 🄿 🄿 Ⓢ 🅂 🏔
             min_y = 0.0
             for items in result:
+                flag = " @"
+                if "CW" in items.get("comment"):
+                    flag = " ○"
+                if "NCDXF B" in items.get("comment"):
+                    flag = " 🗼"
+                if "BCN " in items.get("comment"):
+                    flag = " 🗼"
+                if "FT8" in items.get("comment"):
+                    flag = " ⦿"
+                if "FT4" in items.get("comment"):
+                    flag = " ⦿"
+                if "RTTY" in items.get("comment"):
+                    flag = " ⌾"
+                if "POTA" in items.get("comment"):
+                    flag += "[P]"
+                if "SOTA" in items.get("comment"):
+                    flag += "[S]"
+
                 pen_color = self.text_color
                 if items.get("comment") == "MARKED":
                     pen_color = QColor(254, 194, 17)
@@ -724,7 +746,7 @@ class BandMapWindow(QDockWidget):
                 )
                 text = self.bandmap_scene.addText(
                     items.get("callsign")
-                    + " @ "
+                    + flag
                     + entity
                     + " "
                     + items.get("ts").split()[1][:-3]