not1mm 24.9.28.1__py3-none-any.whl → 24.9.29__py3-none-any.whl

not1mm/lib/plugin_common.py

@@ -38,6 +38,8 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
                 themode = contact.get("Mode", "")
                 if themode == "CWR":
                     themode = "CW"
+                if cabrillo_name in ("CQ-WW-RTTY", "WEEKLY-RTTY"):
+                    themode = "RTTY"
                 frequency = str(Decimal(str(contact.get("Freq", 0))) / 1000)
                 band = get_adif_band(Decimal(str(contact.get("Freq", 0))) / 1000)
                 sentrst = contact.get("SNT", "")

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.28.1"
+__version__ = "24.9.29"

not1mm/plugins/cq_ww_rtty.py

@@ -365,8 +365,23 @@ def cabrillo(self):
                 themode = contact.get("Mode", "")
                 if themode == "LSB" or themode == "USB":
                     themode = "PH"
-                if themode.strip() == "RTTY":
+                if themode.strip() in (
+                        "RTTY",
+                        "RTTY-R",
+                        "LSB-D",
+                        "USB-D",
+                        "AM-D",
+                        "FM-D",
+                        "DIGI-U",
+                        "DIGI-L",
+                        "RTTYR",
+                        "PKTLSB",
+                        "PKTUSB",
+                    ):
                     themode = "RY"
+                exchange1 = contact.get('Exchange1', '')
+                if exchange1 == '':
+                    exchange1 = "DX"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
                 loggeddate = the_date_and_time[:10]
@@ -379,7 +394,7 @@ def cabrillo(self):
                     f"{contact.get('Call', '').ljust(13)} "
                     f"{str(contact.get('RCV', '')).ljust(3)} "
                     f"{str(contact.get('ZN', '')).zfill(2)}",
-                    f"{str(contact.get('Exchange1', '')).ljust(2)}",
+                    f"{str(exchange1).ljust(2)}",
                     end="\r\n",
                     file=file_descriptor,
                 )

{not1mm-24.9.28.1.dist-info → not1mm-24.9.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28.1
+Version: 24.9.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -196,32 +196,21 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
-- ARRL DX CW
-- ARRL DX SSB
+- ARRL DX CW, SSB
 - ARRL Field Day
-- ARRL Sweepstakes CW
-- ARRL Sweepstakes SSB
-- ARRL VHF January
-- ARRL VHF June
-- ARRL VHF September
-- CQ 160 CW
-- CQ 160 SSB
-- CQ WPX CW
-- CQ WPX SSB
-- CQ World Wide CW
-- CQ World Wide RTTY
-- CQ World Wide SSB
+- ARRL Sweepstakes CW, SSB
+- ARRL VHF January, June, September
+- CQ 160 CW, SSB
+- CQ WPX CW, SSB
+- CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
-- IARU Fieldday R1 CW
-- IARU Fieldday R1 SSB
+- IARU Fieldday R1 CW, SSB
 - IARU HF
 - ICWC MST
-- Japan International DX CW
-- Japan International DX SSB
+- Japan International DX CW, SSB
 - K1USN Slow Speed Test
-- NAQP CW
-- NAQP SSB
+- NAQP CW, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -230,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-29] Corrected Cabrillo generation for CQWWRTTY.
+- [24-9-28-2] Fix Cabrillo and ADIF export for cqwwrtty.
 - [24-9-28-1] Add RTTY-R, LSB-D, USB-D, AM-D, FM-D, DIGI-U, DIGI-L, RTTYR, PKTLSB, PKTUSB to list of modes that will load in the RTTY/DG Macros.
 - [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
 - [24-9-25-1] Added WARC and 4M bands.

{not1mm-24.9.28.1.dist-info → not1mm-24.9.29.dist-info}/RECORD

@@ -110,11 +110,11 @@ not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/playsound.py,sha256=kxkcitBFbZCXJ2wxQ1lxg4rBwfxiSpuNpJSXHOPCoXA,9241
-not1mm/lib/plugin_common.py,sha256=HbphFFzU1XIIHgsCHOb_tCAnQyqT-nYnxoiz1oZ2_cg,9623
+not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9727
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=0Su8BQM4haVhc_P74q8UhzRZxtgWhM40UmVtQdMJQeM,10022
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=0GLTHgskO558MPgy6LQ1Mp6xUOD1llhlPkUGFQ1d0s4,50
+not1mm/lib/version.py,sha256=ZPNrAgbRlG8-HZmvqmi3sszmYq_VGWR5V3rNltvB47M,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -137,7 +137,7 @@ not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,
 not1mm/plugins/cq_wpx_cw.py,sha256=9aNzAR-KhznIwUlxUFjAi_hbiw_6RrCMwUBk9I2f6Hs,14037
 not1mm/plugins/cq_wpx_ssb.py,sha256=-hGRovqHR9rfOUnG4LPOoABTb4heH8VAX6rYdJbCqsw,12687
 not1mm/plugins/cq_ww_cw.py,sha256=m4Xkqb_qFyXWEgkxqbanvtiCTvI8NNPKNXzHgFZzhnE,12340
-not1mm/plugins/cq_ww_rtty.py,sha256=RK7xmZN3f_7Pk1bFKXvqEQd1NAsoJFO-xuhLrtp0qhw,16279
+not1mm/plugins/cq_ww_rtty.py,sha256=N0togQbMSpRyRpGoYvnlGC3mpduR82g-D39Swtp5wjI,16772
 not1mm/plugins/cq_ww_ssb.py,sha256=hZwG88-hPLmwIGXHX_S_ty8Nhn1kIuPjSuTRpCWoN9g,12631
 not1mm/plugins/cwt.py,sha256=k5yX_2Ma_arVxzDP2E9mwA08LUVFLOk8vUpHwHt2aGA,12777
 not1mm/plugins/general_logging.py,sha256=n-2es7erqK1ptwq_wwIKIwktptKN7ra2eWjAQlpXUac,3479
@@ -156,9 +156,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.9.28.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.28.1.dist-info/METADATA,sha256=3q6M-YDKhM1aETTHsJ19ljpRbaNE1bQZYVPGANJEgEE,31786
-not1mm-24.9.28.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.9.28.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.28.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.28.1.dist-info/RECORD,,
+not1mm-24.9.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.9.29.dist-info/METADATA,sha256=WiIawgfdxqGoUNJBk7CK6a9y9Ygv7qi-FQE3IHrjDAo,31756
+not1mm-24.9.29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.9.29.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.9.29.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.9.29.dist-info/RECORD,,