refactoring, renaming, optimization

Author: wrecks-code

assets/iconDisabled.png renamed to assets/tray_monitor_disabled.png

@@ -22,31 +22,31 @@
 
 def _check_for_missing_files():
     if not os.path.exists(paths.CONFIG_PATH):
-        log("creating default config")
         _create_default_config_file()
+        log(f"Creating {paths.CONFIG_FILE_NAME}")
 
     if not os.path.exists(paths.ASSETS_DIR_PATH):
         os.mkdir(paths.ASSETS_DIR_PATH)
-        log(f"Creating {paths.ASSETS_DIR_PATH}")
+        log(f"Creating {paths.ASSETS_DIR_NAME} folder")
 
     # Check for Icons
     if not os.path.exists(paths.ASSETS_ICO_PATH):
-        log(f"Downloading icon.ico - {paths.ASSETS_BASE_URL}")
-        download_assets_file(os.path.basename(paths.ASSETS_ICO_PATH))
+        log(f"Downloading {paths.ASSETS_BASE_URL}{paths.ASSETS_ICO_NAME}")
+        download_assets_file(paths.ASSETS_ICO_NAME)
         # sys.exit(1)
     if not os.path.exists(paths.ASSETS_ICON_ENABLED_PATH):
-        log(f"Downloading iconEnabled.png - {paths.ASSETS_BASE_URL}")
-        download_assets_file(os.path.basename(paths.ASSETS_ICON_ENABLED_PATH))
+        log(f"Downloading {paths.ASSETS_BASE_URL}{paths.ASSETS_ICON_ENABLED_NAME}")
+        download_assets_file(paths.ASSETS_ICON_ENABLED_NAME)
         # sys.exit(1)
     if not os.path.exists(paths.ASSETS_ICON_DISABLED_PATH):
-        log(f"Downloading iconDisabled.png - {paths.ASSETS_BASE_URL}")
-        download_assets_file(os.path.basename(paths.ASSETS_ICON_DISABLED_PATH))
+        log(f"Downloading {paths.ASSETS_BASE_URL}{paths.ASSETS_ICON_DISABLED_NAME}")
+        download_assets_file(paths.ASSETS_ICON_DISABLED_NAME)
         # sys.exit(1)
 
     # Check for temp folder
     if not os.path.exists(paths.MMT_DIR_PATH):
         os.makedirs(paths.MMT_DIR_PATH)
-        log(f"Creating {paths.MMT_DIR_PATH}")
+        log(f"Creating {paths.MMT_DIR_NAME} folder")
 
 
 def download_assets_file(image_name):

assets/iconEnabled.png renamed to assets/tray_monitor_enabled.png

@@ -13,24 +13,38 @@ def get_base_path():
 
 
 def strip_package_name_from_path(path):
-    suffix = "\\smct"
+    suffix = "smct"  # Removed the backslash for platform independence
     return path[: -len(suffix)] if path.endswith(suffix) else path
 
 
+# NAMES
+EXE_FILE_NAME = f"{ui_strings.APP_NAME}.exe"
+CONFIG_FILE_NAME = "config.ini"
+LOG_FILE_NAME = "smct.log"
+ASSETS_DIR_NAME = "assets"
+MMT_DIR_NAME = "mmt"
+
+MMT_CSV_NAME = "MultiMonitorToolOutput.csv"
+MMT_CONFIG_NAME = "MultiMonitorToolConfig"
+
+ASSETS_ICON_ENABLED_NAME = "tray_monitor_enabled.png"
+ASSETS_ICON_DISABLED_NAME = "tray_monitor_disabled.png"
+ASSETS_ICO_NAME = "icon.ico"
+
 # PATHS
-BASE_PATH = get_base_path()
-EXE_PATH = BASE_PATH + "\\" + ui_strings.APP_NAME + ".exe"
+ASSETS_BASE_URL = "https://raw.githubusercontent.com/wrecks-code/SimpleMonitorControlTray/main/assets/"
 
-CONFIG_PATH = BASE_PATH + "\\config.ini"
-LOG_PATH = BASE_PATH + "\\smct.log"
-ASSETS_DIR_PATH = BASE_PATH + "\\assets"
-MMT_DIR_PATH = BASE_PATH + "\\mmt"
+BASE_PATH = get_base_path()
+EXE_PATH = os.path.join(BASE_PATH, EXE_FILE_NAME)
 
-MMT_CSV_PATH = MMT_DIR_PATH + "\\MultiMonitorToolOutput.csv"
-MMT_CONFIG_PATH = MMT_DIR_PATH + "\\MultiMonitorToolConfig"
+CONFIG_PATH = os.path.join(BASE_PATH, CONFIG_FILE_NAME)
+LOG_PATH = os.path.join(BASE_PATH, LOG_FILE_NAME)
+ASSETS_DIR_PATH = os.path.join(BASE_PATH, ASSETS_DIR_NAME)
+MMT_DIR_PATH = os.path.join(BASE_PATH, MMT_DIR_NAME)
 
-ASSETS_ICON_ENABLED_PATH = ASSETS_DIR_PATH + "\\iconEnabled.png"
-ASSETS_ICON_DISABLED_PATH = ASSETS_DIR_PATH + "\\iconDisabled.png"
-ASSETS_ICO_PATH = ASSETS_DIR_PATH + "\\icon.ico"
+MMT_CSV_PATH = os.path.join(MMT_DIR_PATH, MMT_CSV_NAME)
+MMT_CONFIG_PATH = os.path.join(MMT_DIR_PATH, MMT_CONFIG_NAME)
 
-ASSETS_BASE_URL = "https://raw.githubusercontent.com/wrecks-code/SimpleMonitorControlTray/main/assets/"
+ASSETS_ICON_ENABLED_PATH = os.path.join(ASSETS_DIR_PATH, ASSETS_ICON_ENABLED_NAME)
+ASSETS_ICON_DISABLED_PATH = os.path.join(ASSETS_DIR_PATH, ASSETS_ICON_DISABLED_NAME)
+ASSETS_ICO_PATH = os.path.join(ASSETS_DIR_PATH, ASSETS_ICO_NAME)

smct/config.py

@@ -6,36 +6,48 @@
 REGISTRY_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
+class RegistryKey:
+    # Automatically called when an object is created.
+    def __init__(self, sub_key, access):
+        self.sub_key = sub_key
+        self.access = access
+        self.key = None
+
+    # Automatically called when entering a context manager (e.g., using the with statement).
+    def __enter__(self):
+        self.key = winreg.OpenKey(
+            winreg.HKEY_CURRENT_USER, self.sub_key, 0, self.access
+        )
+        return self.key
+
+    # Automatically called when exiting a context manager.
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        winreg.CloseKey(self.key)
+
+
 def is_autostartkey_in_registry():
     try:
-        key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, REGISTRY_KEY, 0, winreg.KEY_READ)
-        value = winreg.QueryValueEx(key, KEY_NAME)
-        winreg.CloseKey(key)
-        return value is not None
+        with RegistryKey(REGISTRY_KEY, winreg.KEY_READ) as key:
+            value = winreg.QueryValueEx(key, KEY_NAME)
+            return value is not None
     except FileNotFoundError:
         return False
 
 
 def add_to_autostart():
     try:
-        key = winreg.OpenKey(
-            winreg.HKEY_CURRENT_USER, REGISTRY_KEY, 0, winreg.KEY_WRITE
-        )
-        exe_path = paths.EXE_PATH[0].upper() + paths.EXE_PATH[1:]
-        winreg.SetValueEx(key, KEY_NAME, 0, winreg.REG_SZ, exe_path)
-        winreg.CloseKey(key)
-        log(f"Enabled autostart, wrote {KEY_NAME} to {REGISTRY_KEY}")
+        with RegistryKey(REGISTRY_KEY, winreg.KEY_WRITE) as key:
+            exe_path = paths.EXE_PATH[0].upper() + paths.EXE_PATH[1:]
+            winreg.SetValueEx(key, KEY_NAME, 0, winreg.REG_SZ, exe_path)
+            log(f"Enabled autostart, wrote {KEY_NAME} to {REGISTRY_KEY}")
     except PermissionError as e:
         log(f"Failed to enable autostart: {e} in {REGISTRY_KEY}")
 
 
 def remove_from_autostart():
     try:
-        key = winreg.OpenKey(
-            winreg.HKEY_CURRENT_USER, REGISTRY_KEY, 0, winreg.KEY_ALL_ACCESS
-        )
-        winreg.DeleteValue(key, KEY_NAME)
-        winreg.CloseKey(key)
-        log(f"Disabled autostart, removed {KEY_NAME} from {REGISTRY_KEY}")
+        with RegistryKey(REGISTRY_KEY, winreg.KEY_ALL_ACCESS) as key:
+            winreg.DeleteValue(key, KEY_NAME)
+            log(f"Disabled autostart, removed {KEY_NAME} from {REGISTRY_KEY}")
     except (FileNotFoundError, PermissionError) as e:
         log(f"Failed to disable autostart: {e} in {REGISTRY_KEY}")