not1mm 24.11.21__py3-none-any.whl → 24.11.23__py3-none-any.whl

not1mm/__main__.py

@@ -256,7 +256,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionNew_Database.triggered.connect(self.new_database)
         self.actionOpen_Database.triggered.connect(self.open_database)
 
-        self.actionEdit_Macros.triggered.connect(self.edit_cw_macros)
+        self.actionEdit_Macros.triggered.connect(self.edit_macros)
 
         self.actionAbout.triggered.connect(self.show_about_dialog)
         self.actionHotKeys.triggered.connect(self.show_key_help)
@@ -659,7 +659,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Loading contest.")
         self.load_contest()
         self.show_splash_msg("Reading macros.")
-        self.read_cw_macros()
+        self.read_macros()
 
         self.show_splash_msg("Starting FlDigi watcher.")
         self.fldigi_watcher = FlDigiWatcher()
@@ -1627,6 +1627,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     cmd["COLUMNS"] = self.contest.columns
                     if self.log_window:
                         self.log_window.msg_from_main(cmd)
+            self.read_macros()
 
     def check_for_new_cty(self) -> None:
         """
@@ -2804,7 +2805,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         self.pref["run_state"] = self.radioButton_run.isChecked()
         self.write_preference()
-        self.read_cw_macros()
+        self.read_macros()
         self.check_esm()
 
     def write_preference(self) -> None:
@@ -3351,7 +3352,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode in (
             "DIGI-U",
@@ -3372,7 +3373,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode == "SSB":
             if intended_freq:
@@ -3393,7 +3394,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
 
     def check_callsign(self, callsign) -> None:
         """
@@ -3480,7 +3481,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "CW"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
                 if self.contest:
                     if self.contest.name == "ICWC Medium Speed Test":
                         self.contest.prefill(self)
@@ -3490,14 +3491,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "SSB"
                 self.sent.setText("59")
                 self.receive.setText("59")
-                self.read_cw_macros()
+                self.read_macros()
             return
         if mode in ("RTTY", "DIGI-U", "DIGI-L"):
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
 
     def get_opon(self) -> None:
         """
@@ -3664,18 +3665,13 @@ class MainWindow(QtWidgets.QMainWindow):
             except TypeError as err:
                 logger.debug(f"{err=} {vfo=} {the_dict=}")
 
-    def edit_cw_macros(self) -> None:
-        """
-        Calls the default text editor to edit the CW macro file.
-
-        Parameters
-        ----------
-        None
-
-        Returns
-        -------
-        None
-        """
+    def get_macro_filename(self):
+        """"""
+        # Have not1mm check in USER_DATA_PATH for the existence of a folder with the contests name.
+        # If it exists, check to see if a cw/ssb/rtty macro files exists within it and load them before
+        # falling back to the default ones.
+        # If user selects menu option to edit the current macro file, make the previous checks, if the
+        # specific one does not exist, copy the default to the contest directory and edit that copy.
         if self.radio_state.get("mode") in ("CW", "CW-L", "CW-R", "CWR"):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
@@ -3695,8 +3691,14 @@ class MainWindow(QtWidgets.QMainWindow):
             macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"
+
+        try:
+            if not (fsutils.USER_DATA_PATH / self.contest.name).exists():
+                os.mkdir(fsutils.USER_DATA_PATH / self.contest.name)
+        except AttributeError:
+            return ""
+
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
             try:
                 copyfile(
                     fsutils.APP_DATA_PATH / macro_file,
@@ -3704,57 +3706,50 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
             except IOError as err:
                 logger.critical(f"Error {err} copying macro file.")
+
+        if not (fsutils.USER_DATA_PATH / self.contest.name / macro_file).exists():
+            try:
+                copyfile(
+                    fsutils.APP_DATA_PATH / macro_file,
+                    fsutils.USER_DATA_PATH / self.contest.name / macro_file,
+                )
+            except IOError as err:
+                logger.critical(f"Error {err} copying macro file.")
+
+        return fsutils.USER_DATA_PATH / self.contest.name / macro_file
+
+    def edit_macros(self) -> None:
+        """
+        Calls the default text editor to edit the CW macro file.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+
+        macro_file = self.get_macro_filename()
+
         try:
-            fsutils.openFileWithOS(fsutils.USER_DATA_PATH / macro_file)
+            fsutils.openFileWithOS(macro_file)
         except FileNotFoundError | PermissionError | OSError as err:
-            logger.critical(
-                f"Could not open file {fsutils.USER_DATA_PATH / macro_file} {err}"
-            )
-        self.read_cw_macros()
+            logger.critical(f"Could not open file {macro_file} {err}")
+        self.read_macros()
 
-    def read_cw_macros(self) -> None:
+    def read_macros(self) -> None:
         """
         Reads in the CW macros, firsts it checks to see if the file exists. If it does not,
         and this has been packaged with pyinstaller it will copy the default file from the
         temp directory this is running from... In theory.
         """
 
-        if self.radio_state.get("mode") in (
-            "CW",
-            "CW-L",
-            "CW-R",
-        ):
-            macro_file = "cwmacros.txt"
-        elif self.radio_state.get("mode") in (
-            "RTTY",
-            "RTTY-R",
-            "LSB-D",
-            "USB-D",
-            "AM-D",
-            "FM-D",
-            "DIGI-U",
-            "DIGI-L",
-            "RTTYR",
-            "PKTLSB",
-            "PKTUSB",
-        ):
-            macro_file = "rttymacros.txt"
-        else:
-            macro_file = "ssbmacros.txt"
+        macro_file = self.get_macro_filename()
 
-        if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
-            try:
-                copyfile(
-                    fsutils.APP_DATA_PATH / macro_file,
-                    fsutils.USER_DATA_PATH / macro_file,
-                )
-            except IOError as err:
-                logger.critical(f"Error {err} copying macro file.")
         try:
-            with open(
-                fsutils.USER_DATA_PATH / macro_file, "r", encoding="utf-8"
-            ) as file_descriptor:
+            with open(macro_file, "r", encoding="utf-8") as file_descriptor:
                 for line in file_descriptor:
                     mode, fkey, buttonname, cwtext = line.split("|")
                     if mode.strip().upper() == "R" and self.pref.get("run_state"):

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.21"
+__version__ = "24.11.23"

{not1mm-24.11.21.dist-info → not1mm-24.11.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.21
+Version: 24.11.23
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -238,6 +238,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-23] Made macros per contest.
 - [24-11-21] Merged PR from alduhoo setting CW Speed via rigctld, Added ESM and call history support for General Logging.
 - [24-11-19] Added ESM to Stew Perry, Phone Weekly, Medium Speed Test and JIDX.
 - [24-11-18] Accepted PR from dg9vh for the DARC XMAS Contest.

{not1mm-24.11.21.dist-info → not1mm-24.11.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=gTvMiyHVY5BEFCOCKT7_q6IkcYu1BDU3treXZk3jQ_8,142394
+not1mm/__main__.py,sha256=IKdrA6p-ScJtcuD9s0J4QsYNxqbobTJkIQs6nz4qw3o,142522
 not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -114,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=AABdx9DoTT8Znrup7AkfmKGC22hshMsEypiMqV0iKw0,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=Xt0WE2ro_kUYdugQ0Pe1SQX07MHrJ0jyQqDqAKKqxuU,13564
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=2KuOTzQ3XUC08hkaFvx9RVIiA2YL9VANgy4nxwliSJQ,49
+not1mm/lib/version.py,sha256=i-XV0bR64KuRtURdg5UiGO_HwzJh30A1goTNLNf275w,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=r2YkRNiMS_3hXrf3zeiijzW24roilyIXnwXwTd07X8M,11208
 not1mm/plugins/10_10_spring_cw.py,sha256=EBBcVgxDhtAK7cGHq9LOU6LhY9vSqlk7GEkApn3KRYM,11213
@@ -162,9 +162,9 @@ not1mm/plugins/ref_ssb.py,sha256=G2Gz4kApchmOZQVnBexEokSEvdb-mZWJAfyJ1D6JDGY,204
 not1mm/plugins/stew_perry_topband.py,sha256=Gy_vv6tgkR-3vmvsUVO0pVfHMkUJSxpt7G4secn0RH8,15084
 not1mm/plugins/weekly_rtty.py,sha256=PI0_AtEdZZKGAuKnP-b2EYn9xwCN1Ablk38trbNP3Rc,19603
 not1mm/plugins/winter_field_day.py,sha256=9w3tDL9ZWiENSTERc3vzDbBktvI7pnyNvlH6fDjAi08,14841
-not1mm-24.11.21.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.11.21.dist-info/METADATA,sha256=xa2JnhPq2yIm7akc8rqc6RMn53bqVd5LqqAoHIfevns,36614
-not1mm-24.11.21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.11.21.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.11.21.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.11.21.dist-info/RECORD,,
+not1mm-24.11.23.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.11.23.dist-info/METADATA,sha256=7la-wqRZm6lciPrTOHi8B_ly4eoiBqCUowixz38RbSU,36652
+not1mm-24.11.23.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.11.23.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.11.23.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.11.23.dist-info/RECORD,,