not1mm 24.2.4__py3-none-any.whl → 24.2.13__py3-none-any.whl

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "24.2.4"
+__version__ = "24.2.13"

not1mm/plugins/arrl_dx_cw.py

@@ -1,6 +1,7 @@
 """ARRL plugin"""
 
 # pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member, unused-import
+# pylint: disable=logging-fstring-interpolation
 
 import datetime
 import logging
@@ -116,12 +117,12 @@ def points(self):
     result = self.cty_lookup(self.station.get("Call", ""))
     if result:
         for item in result.items():
-            mycountry = item[1].get("entity", "")
+            mycountry = item[1].get("primary_pfx", "")
             # mycontinent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
     if result:
         for item in result.items():
-            entity = item[1].get("entity", "")
+            entity = item[1].get("primary_pfx", "")
             # continent = item[1].get("continent", "")
             if mycountry in ["K", "VE"]:
                 if entity in ["K", "VE"]:

not1mm/plugins/arrl_dx_ssb.py

@@ -1,6 +1,7 @@
 """ARRL plugin"""
 
 # pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member, unused-import
+# pylint: disable=logging-fstring-interpolation
 
 import datetime
 import logging
@@ -114,14 +115,16 @@ def prefill(self):
 def points(self):
     """Calc point"""
     result = self.cty_lookup(self.station.get("Call", ""))
+    logger.debug(f"our lookup result: {result}")
     if result:
         for item in result.items():
-            mycountry = item[1].get("entity", "")
+            mycountry = item[1].get("primary_pfx", "")
             # mycontinent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
+    logger.debug(f"their lookup result: {result}")
     if result:
         for item in result.items():
-            entity = item[1].get("entity", "")
+            entity = item[1].get("primary_pfx", "")
             # continent = item[1].get("continent", "")
             if mycountry in ["K", "VE"]:
                 if entity in ["K", "VE"]:

not1mm/testing/simulant.py

@@ -0,0 +1,384 @@
+#!/usr/bin/env python3
+"""Simulated Field Day club participant"""
+
+# pylint: disable=global-statement, raise-missing-from
+
+import random
+import socket
+import uuid
+import time
+import threading
+import queue
+import argparse
+from random import randint
+from datetime import datetime
+from json import dumps, loads, JSONDecodeError
+
+
+parser = argparse.ArgumentParser(description="Simulate a Field Day participant.")
+parser.add_argument("-c", "--call", type=str, help="Your Callsign")
+parser.add_argument("-b", "--band", type=str, help="Your Band")
+parser.add_argument("-m", "--mode", type=str, help="Your Mode")
+parser.add_argument("-p", "--power", type=str, help="Your Power")
+
+args = parser.parse_args()
+
+MULTICAST_PORT = 2239
+MULTICAST_GROUP = "239.1.1.1"
+INTERFACE_IP = "0.0.0.0"
+GROUP_CALL = None
+
+eightymeterstalk = (
+    "What are the @stats?",
+    "That K6GTE guy is a jerk!",
+    "I worked your mama on 80 meters.",
+    "I have nothing interesting to add, I'm just running my keys.",
+    "Who's here that has gout?",
+    "Jim, go to 40",
+    "I gotta pee again, someone cover the GOTA station.",
+    "Who made that 'Chili'... Gawd aweful!",
+    ".. -..  - .- .--.  - .... .- -",
+    "Why's no one covering 160?",
+    "That FT8, It's so enjoyable!",
+    "Yes Jim, you have to DISCONNECT the dummy load.",
+)
+
+bands = ("160", "80", "40", "20", "15", "10", "6", "2")
+if args.band:
+    if args.band in bands:
+        BAND = args.band
+    else:
+        print('Allowed bands: "160", "80", "40", "20", "15", "10", "6", "2"')
+        raise SystemExit(1)
+else:
+    BAND = bands[random.randint(0, len(bands) - 1)]
+
+modes = ("CW", "PH", "DI")
+if args.mode:
+    if args.mode.upper() in modes:
+        MODE = args.mode.upper()
+    else:
+        print('Allowed modes: "CW", "PH", "DI"')
+        raise SystemExit(1)
+else:
+    MODE = modes[random.randint(0, len(modes) - 1)]
+
+if args.power:
+    try:
+        POWER = int(args.power)
+        if POWER < 1 or POWER > 100:
+            raise ValueError
+    except ValueError:
+        print("Power is a number between 1 and 100")
+        raise SystemExit(1)
+else:
+    POWER = 5
+
+udp_fifo = queue.Queue()
+server_commands = []
+
+
+def generate_class():
+    """Generates a valid Field Day class"""
+    suffix = ["A", "B", "C", "D", "E", "F"][random.randint(0, 5)]
+    if "C" in suffix:
+        return "1C"
+    if "D" in suffix:
+        return "1D"
+    if "E" in suffix:
+        return "1E"
+    if "B" in suffix:
+        return str(random.randint(1, 2)) + suffix
+    if "A" in suffix:
+        return str(random.randint(3, 20)) + suffix
+
+    return str(random.randint(1, 20)) + suffix
+
+
+def generate_callsign():
+    """Generates a US callsign, Need to add the land of maple syrup."""
+    prefix = ["A", "K", "N", "W"]
+    letters = [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+    ]
+    callsign = prefix[random.randint(0, 3)]
+
+    add_second_prefix_letter = random.randint(0, 2) == 0
+    if "A" in callsign:  # We have no choice. Must add second prefix.
+        callsign += letters[random.randint(0, 11)]
+        add_second_prefix_letter = False
+
+    if add_second_prefix_letter:
+        callsign += letters[random.randint(0, 25)]
+
+    callsign += str(random.randint(0, 9))
+    if "A" in callsign[0]:
+        suffix_length = random.randint(1, 2)
+    else:
+        length = [
+            1,
+            2,
+            2,
+            3,
+            3,
+            3,
+        ]  # Stupid way to get a weighted result. But I'm stupid so it's normal.
+        suffix_length = length[random.randint(0, 5)]
+
+    for unused_variable in range(suffix_length):
+        callsign += letters[random.randint(0, 25)]
+
+    return callsign
+
+
+def generate_section(call):
+    """Generate section based on call region"""
+    call_areas = {
+        "0": "CO MO IA ND KS NE MN SD",
+        "1": "CT RI EMA VT ME WMA NH",
+        "2": "ENY NNY NLI SNJ NNJ WNY",
+        "3": "DE MDC EPA WPA",
+        "4": "AL SC GA SFL KY TN NC VA NFL VI PR WCF",
+        "5": "AR NTX LA OK MS STX NM WTX",
+        "6": "EBA SCV LAX SDG ORG SF PAC SJV SB SV",
+        "7": "AK NV AZ OR EWA UT ID WWA MT WY",
+        "8": "MI WV OH",
+        "9": "IL WI IN",
+    }
+    if call[1].isdigit():
+        area = call[1]
+    else:
+        area = call[2]
+    sections = call_areas[area].split()
+    return sections[random.randint(0, len(sections) - 1)]
+
+
+def fakefreq(band, mode):
+    """
+    If unable to obtain a frequency from the rig,
+    This will return a sane value for a frequency mainly for the cabrillo and adif log.
+    Takes a band and mode as input and returns freq in khz.
+    """
+    _modes = {"CW": 0, "DI": 1, "PH": 2, "FT8": 1, "SSB": 2}
+    fakefreqs = {
+        "160": ["1830", "1805", "1840"],
+        "80": ["3530", "3559", "3970"],
+        "60": ["5332", "5373", "5405"],
+        "40": ["7030", "7040", "7250"],
+        "30": ["10130", "10130", "0000"],
+        "20": ["14030", "14070", "14250"],
+        "17": ["18080", "18100", "18150"],
+        "15": ["21065", "21070", "21200"],
+        "12": ["24911", "24920", "24970"],
+        "10": ["28065", "28070", "28400"],
+        "6": ["50.030", "50300", "50125"],
+        "2": ["144030", "144144", "144250"],
+        "222": ["222100", "222070", "222100"],
+        "432": ["432070", "432200", "432100"],
+        "SAT": ["144144", "144144", "144144"],
+    }
+    freqtoreturn = fakefreqs[band][_modes[mode]]
+    return freqtoreturn
+
+
+def log_contact():
+    """Send a contgact to the server."""
+    unique_id = uuid.uuid4().hex
+    callsign = generate_callsign()
+    contact = {
+        "cmd": "POST",
+        "hiscall": callsign,
+        "class": generate_class(),
+        "section": generate_section(callsign),
+        "mode": MODE,
+        "band": BAND,
+        "frequency": int(float(fakefreq(BAND, MODE)) * 1000),
+        "date_and_time": datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
+        "power": POWER,
+        "grid": "DM13at",
+        "opname": "John Doe",
+        "station": STATION_CALL,
+        "unique_id": unique_id,
+    }
+    server_commands.append(contact)
+    bytes_to_send = bytes(dumps(contact), encoding="ascii")
+    try:
+        s.sendto(bytes_to_send, (MULTICAST_GROUP, int(MULTICAST_PORT)))
+    except OSError as err:
+        print(f"Error: {err}")
+        # logging.warning("%s", err)
+
+
+def remove_confirmed_commands(data):
+    """Removed confirmed commands from the sent commands list."""
+    for index, item in enumerate(server_commands):
+        if item.get("unique_id") == data.get("unique_id") and item.get(
+            "cmd"
+        ) == data.get("subject"):
+            server_commands.pop(index)
+            print(f"Confirmed {data.get('subject')}")
+
+
+def watch_udp():
+    """Puts UDP datagrams in a FIFO queue"""
+    while True:
+        try:
+            datagram = s.recv(1500)
+        except socket.timeout:
+            time.sleep(1)
+            continue
+        if datagram:
+            udp_fifo.put(datagram)
+
+
+def check_udp_queue():
+    """checks the UDP datagram queue."""
+    global GROUP_CALL
+    while not udp_fifo.empty():
+        datagram = udp_fifo.get()
+        try:
+            json_data = loads(datagram.decode())
+        except UnicodeDecodeError as err:
+            the_error = f"Not Unicode: {err}\n{datagram}"
+            print(the_error)
+            continue
+        except JSONDecodeError as err:
+            the_error = f"Not JSON: {err}\n{datagram}"
+            print(the_error)
+            continue
+        # logging.info("%s", json_data)
+        if json_data.get("cmd") == "PING":
+            pass
+            # print(f"[{strftime('%H:%M:%S', gmtime())}] {json_data}")
+        if json_data.get("cmd") == "RESPONSE":
+            if json_data.get("recipient") == STATION_CALL:
+                if json_data.get("subject") == "HOSTINFO":
+                    GROUP_CALL = str(json_data.get("groupcall"))
+                    return
+                if json_data.get("subject") == "LOG":
+                    print("Server Generated Log.")
+
+                remove_confirmed_commands(json_data)
+
+        if json_data.get("cmd") == "CONFLICT":
+            band, mode = json_data.get("bandmode").split()
+            if (
+                band == BAND
+                and mode == MODE
+                and json_data.get("recipient") == STATION_CALL
+            ):
+                print(f"CONFLICT ON {json_data.get('bandmode')}")
+        if json_data.get("cmd") == "GROUPQUERY":
+            if GROUP_CALL:
+                send_status_udp()
+
+
+def send_chat():
+    """Sends UDP chat packet with text entered in chat_entry field."""
+    message = eightymeterstalk[randint(0, len(eightymeterstalk) - 1)]
+    packet = {"cmd": "CHAT"}
+    packet["sender"] = STATION_CALL
+    packet["message"] = message
+    bytes_to_send = bytes(dumps(packet), encoding="ascii")
+    try:
+        s.sendto(bytes_to_send, (MULTICAST_GROUP, int(MULTICAST_PORT)))
+    except OSError as err:
+        print(f"{err}")
+
+
+def query_group():
+    """Sends request to server asking for group call/class/section."""
+    update = {
+        "cmd": "GROUPQUERY",
+        "station": STATION_CALL,
+    }
+    bytes_to_send = bytes(dumps(update), encoding="ascii")
+    try:
+        s.sendto(bytes_to_send, (MULTICAST_GROUP, int(MULTICAST_PORT)))
+    except OSError as err:
+        print(f"{err}")
+
+
+def send_status_udp():
+    """Send status update to server informing of our band and mode"""
+
+    if GROUP_CALL is None:
+        query_group()
+        # return
+
+    update = {
+        "cmd": "PING",
+        "mode": MODE,
+        "band": BAND,
+        "station": STATION_CALL,
+    }
+    bytes_to_send = bytes(dumps(update), encoding="ascii")
+    try:
+        s.sendto(bytes_to_send, (MULTICAST_GROUP, int(MULTICAST_PORT)))
+    except OSError as err:
+        print(f"Error: {err}")
+
+
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+s.bind(("", MULTICAST_PORT))
+mreq = socket.inet_aton(MULTICAST_GROUP) + socket.inet_aton(INTERFACE_IP)
+s.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, bytes(mreq))
+s.settimeout(0.01)
+
+if args.call:
+    STATION_CALL = args.call.upper()
+else:
+    STATION_CALL = generate_callsign()
+
+
+def main():
+    """The main loop"""
+    _udpwatch = threading.Thread(
+        target=watch_udp,
+        daemon=True,
+    )
+    _udpwatch.start()
+    print(f"Station: {STATION_CALL} on {BAND}M {MODE}")
+    send_status_udp()
+    count = 0
+    while True:
+        count += 1
+        if count % 30 == 0:
+            log_contact()
+        if count % 15 == 0:
+            send_status_udp()
+        if count % 45 == 0:
+            send_chat()
+        check_udp_queue()
+
+        time.sleep(1)
+
+
+if __name__ == "__main__":
+    main()

{not1mm-24.2.4.dist-info → not1mm-24.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.2.4
+Version: 24.2.13
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -165,6 +165,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-2-13] Fixed no points being assigned in ARRL DX, reported by NC8R.
 - [24-2-4] Fixed Cabrillo name in 10 10 Winter Phone. Added missing Club tag in all the cabrillo contest files.
 - [24-2-3] Merge PR from @wvolz.
 - [24-2-1] Fix bug in bandmap, quotation mark mismatch. Changed CAT timeout back to 0.5 seconds.

{not1mm-24.2.4.dist-info → not1mm-24.2.13.dist-info}/RECORD

@@ -102,7 +102,7 @@ not1mm/lib/plugin_common.py,sha256=Oggv0Hnvh0CCAiNLygDdTSYV1rmzOptg8nqStFRUi_U,7
 not1mm/lib/select_contest.py,sha256=XQdRUkPAIHIMVsilm82M54b_v9yWpYrZ1nfInJrtZoo,363
 not1mm/lib/settings.py,sha256=t_JLJPnDBtMGAvJMAF1AL1eVB7MyucqlksVTU47yxvk,8933
 not1mm/lib/super_check_partial.py,sha256=GlXgtIblL602iW-V6Mmdf5S4FxtzJ95TbPMMa9xXUfg,1692
-not1mm/lib/version.py,sha256=07nYXqqebn2FdXgPNQUs8s2fNYKhcOq6YsUR_5VeF_g,46
+not1mm/lib/version.py,sha256=mIJIkTfm9OS6buHK6J38xjWzfVhUxpeHmJosWhFsgsw,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=8cN7QmGKWzz_jgu48DzWwy5VbbY3-ntT2Q1DSVbgkwE,10692
 not1mm/plugins/10_10_spring_cw.py,sha256=cgCLyGw-w8SjKooDxY6PjJFUjVKgI48bzrOsyasOapY,10698
@@ -110,8 +110,8 @@ not1mm/plugins/10_10_summer_phone.py,sha256=WR7bMPY11vLleT8VuyMBElyjDq_KlfRL5g4t
 not1mm/plugins/10_10_winter_phone.py,sha256=ZXoUCXC-RhgirI-VHA7-s76LgS5mHcOaT29Jg_9zD_s,10709
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_10m.py,sha256=Cp3COORlROvfLvRi5R5fA1yCmbDCrl2KOTu7t_Yt6u8,13501
-not1mm/plugins/arrl_dx_cw.py,sha256=vbk7cKBTRK98vBsQ5ixqv1-SdDWlwYJCxdWckcQsCzQ,11558
-not1mm/plugins/arrl_dx_ssb.py,sha256=nWXv-rqzPafXcWBAMZ8aNjbXKGyvwmimHCUyVMXJ59Y,11562
+not1mm/plugins/arrl_dx_cw.py,sha256=BFQKseNO56vIdGGB3zGxN5-rvWA06-7YElTBFELDN9c,11616
+not1mm/plugins/arrl_dx_ssb.py,sha256=jZSXD4ce6QLwo1OrNuSeqlfpqCHyg59T-UMsvsN6hOY,11720
 not1mm/plugins/arrl_field_day.py,sha256=aiQjnWsorjMk1kFHQZMFI6pBc1Z6q2-nx0hhSXN45pI,9884
 not1mm/plugins/arrl_rtty_ru.py,sha256=9v9wApmUZHAKX4t_O6hVqBnT7v5bqAGV8SjgDhfOuMs,7974
 not1mm/plugins/arrl_ss_cw.py,sha256=kmQ-DZnNCyivVmnRtW5H1z3b6tFFXXUljwfao5uLVnI,13001
@@ -138,12 +138,13 @@ not1mm/testing/fakeflrig.py,sha256=_vJHGjARpSNxSZngkHNO_kkHoVnqtf--T6gwTAYnnZQ,2
 not1mm/testing/flrigclient.py,sha256=24r_0HqpoTjyJ6Bqg_HIC8Nn9wjtnwwWQ26I7UprwgA,1658
 not1mm/testing/multicast_listener.py,sha256=2CkiyZ4EQxBX68_1QzGIX9g_UB9-CQq63OH-pUY3FiU,1051
 not1mm/testing/n1mm_listener.py,sha256=UD-qyKEnppQua330WEFKMvMJaNjnYKi7dDuX_RGB5lQ,1099
+not1mm/testing/simulant.py,sha256=kBqCZTe3ADEuHUsh9ygY9usn-jKe4EKRh7-L6tY6iYE,10948
 not1mm/testing/test.py,sha256=wGblvMlyOCVkEiHbxE6wvLsorim15ehL72_EZLQeWkk,1660
 testing/test.py,sha256=q7socQaMu46q-I-1fYgmQhnygrrC5NjAUM5yuySo4fA,249
 usb_vfo_knob/code.py,sha256=h59iPPlcYbkXmRcYPQHDBP0yfLEl7fY3VkiIszdQeyI,1057
-not1mm-24.2.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.2.4.dist-info/METADATA,sha256=p-kXg3g-B9xEsaR0BOS5_iGU3GFGR1l_ioSj8W3H5gk,25670
-not1mm-24.2.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-not1mm-24.2.4.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.2.4.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
-not1mm-24.2.4.dist-info/RECORD,,
+not1mm-24.2.13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.2.13.dist-info/METADATA,sha256=evuyRTVVDYHeUzYindGV40y9hRZLJbqHQb11JZcVgQA,25744
+not1mm-24.2.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+not1mm-24.2.13.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.2.13.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
+not1mm-24.2.13.dist-info/RECORD,,