fixed path issues when executing with exe + renaming

Author: wrecks-code

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.analysis.typeCheckingMode": "off"
+}

SimpleMonitorControlTray/__init__.py renamed to SimpleMonitorControlTrayModule/__init__.py

@@ -0,0 +1,23 @@
+import os
+import shutil
+
+import SimpleMonitorControlTrayModule.directoryHandler as dH
+
+startup_folder = os.path.expanduser(
+    "~\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup"
+)
+shortcut_filename = dH.APP_NAME + ".lnk"
+shortcut_path = os.path.join(startup_folder, shortcut_filename)
+
+
+def addShortcutToStartupFolder():
+    shutil.copy2(dH.getDirectory(), shortcut_path)
+
+
+def removeShortcutFromStartupFolder():
+    if is_shortcut_in_startup():
+        os.remove(shortcut_path)
+
+
+def is_shortcut_in_startup():
+    return os.path.exists(shortcut_path)

SimpleMonitorControlTrayModule/autoStartHandler.py

@@ -1,11 +1,11 @@
 import configparser
 import os
 
-import SimpleMonitorControlTray.monitorHandler as mH
-import SimpleMonitorControlTray.notificationHandler as nH
-import SimpleMonitorControlTray.trayHandler as tH
+import SimpleMonitorControlTrayModule.directoryHandler as dH
+import SimpleMonitorControlTrayModule.monitorHandler as mH
+import SimpleMonitorControlTrayModule.notificationHandler as nH
+import SimpleMonitorControlTrayModule.trayHandler as tH
 
-currentPath = os.getcwd()
 config_file_path = "config.ini"
 assets_folder = "assets"
 asset_iconEnabled = "assets\iconEnabled.png"
@@ -27,14 +27,14 @@ def check_for_missing_files():
     if not os.path.exists(MULTIMONITORTOOL_PATH):
         nH.sendError(MULTIMONITORTOOL_PATH + fileNotFound)
         tH.exitItemClicked()
-    if not os.path.exists(os.path.join(currentPath, asset_iconEnabled)):
+    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled)):
         nH.sendError(asset_iconDisabled + fileNotFound)
         tH.exitItemClicked()
 
     if not os.path.exists(CSV_FILE_PATH):
         mH.saveMultiMonitorToolConfig()
 
-    multiMonitorToolOutputPath = os.path.join(currentPath, "MultiMonitorTool")
+    multiMonitorToolOutputPath = os.path.join(dH.getDirectory(), "MultiMonitorTool")
 
     if not os.path.exists(multiMonitorToolOutputPath):
         os.makedirs(multiMonitorToolOutputPath)
@@ -51,7 +51,7 @@ def read_config():
 
     global AUTOSTART, MULTIMONITORTOOL_PATH, CSV_FILE_PATH, MM_CONFIG_FILE_PATH, MONITOR_NAME
 
-    if not os.path.exists(os.path.join(currentPath, asset_iconEnabled)):
+    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled)):
         nH.sendError(config_file_path + fileNotFound)
         tH.exitItemClicked()
 

SimpleMonitorControlTray/configHandler.py renamed to SimpleMonitorControlTrayModule/configHandler.py

@@ -0,0 +1,20 @@
+import os
+import sys
+
+APP_NAME = "SimpleMonitorControlTray"
+
+
+def getDirectory():
+    if getattr(sys, "frozen", False):
+        module_dir = os.path.dirname(sys.executable)
+    else:
+        module_dir = os.path.dirname(os.path.abspath(__file__))
+    return stripPath(module_dir)
+
+
+def stripPath(path):
+    suffix = "\\SimpleMonitorControlTrayModule"
+    if path.endswith(suffix):
+        return path[: -len(suffix)]
+    else:
+        return path

SimpleMonitorControlTrayModule/directoryHandler.py

@@ -1,7 +1,7 @@
 import csv
 import subprocess
 
-import SimpleMonitorControlTray.configHandler as ch
+import SimpleMonitorControlTrayModule.configHandler as ch
 
 
 def saveMultiMonitorToolConfig():

SimpleMonitorControlTray/monitorHandler.py renamed to SimpleMonitorControlTrayModule/monitorHandler.py

@@ -1,14 +1,24 @@
 import os
 import winreg as reg
 
-import main
-
 keyName = "SimpleMonitorControlTray"
 
-exe_path = os.path.join(main.script_dir, keyName + ".exe")
+import SimpleMonitorControlTrayModule.directoryHandler as dH
+
+exe_path = os.path.join(dH.getDirectory(), keyName + ".exe")
 registry_key = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
+def isAutostartKeyinRegistry():
+    try:
+        key = reg.OpenKey(reg.HKEY_CURRENT_USER, registry_key)
+        value, _ = reg.QueryValueEx(key, keyName)
+        reg.CloseKey(key)
+        return True
+    except FileNotFoundError:
+        return False
+
+
 def add_to_autostart():
     key = reg.OpenKey(reg.HKEY_CURRENT_USER, registry_key, 0, reg.KEY_WRITE)
     reg.SetValueEx(key, keyName, 0, reg.REG_SZ, exe_path)

SimpleMonitorControlTray/notificationHandler.py renamed to SimpleMonitorControlTrayModule/notificationHandler.py

@@ -4,22 +4,20 @@
 from PIL import Image
 from pystray import MenuItem as item
 
-import main
-import SimpleMonitorControlTray.configHandler as cH
-import SimpleMonitorControlTray.monitorHandler as mH
-import SimpleMonitorControlTray.registryHandler as rH
-
-# TODO this returns the wrong path (System32) if run from registry autostart
-script_dir = main.script_dir
-
-imageIconEnabled = Image.open(os.path.join(script_dir, "assets\iconEnabled.png"))
-imageIconDisabled = Image.open(os.path.join(script_dir, "assets\iconDisabled.png"))
-
-title = "SimpleMonitorControlTray"
+import SimpleMonitorControlTrayModule.autoStartHandler as aH
+import SimpleMonitorControlTrayModule.configHandler as cH
+import SimpleMonitorControlTrayModule.directoryHandler as dH
+import SimpleMonitorControlTrayModule.monitorHandler as mH
 
 icon = None
 itemTitle = ""
 
+script_dir = dH.getDirectory()
+assets_dir = script_dir + "\\assets"
+
+imageIconEnabled = Image.open(os.path.join(assets_dir, "iconEnabled.png"))
+imageIconDisabled = Image.open(os.path.join(assets_dir, "iconDisabled.png"))
+
 
 def saveMultiMonitorToolConfigClicked():
     mH.saveMultiMonitorToolConfig()
@@ -43,22 +41,19 @@ def openConfigClicked():
     os.startfile(os.path.join(script_dir, cH.config_file_path))
 
 
-def toggleAutostartInConfig():
+def toggleAutostart(icon):
     global itemTitle
     if cH.AUTOSTART == "False":
         itemTitle = "Disable Autostart"
-        rH.add_to_autostart()
+        aH.addShortcutToStartupFolder()
         cH.set_config_value("SETTINGS", "autostart", "True")
         cH.AUTOSTART = "True"
     else:
         itemTitle = "Enable Autostart"
-        rH.remove_from_autostart()
+        aH.removeShortcutFromStartupFolder()
         cH.set_config_value("SETTINGS", "autostart", "False")
         cH.AUTOSTART = "False"
 
-
-def toggleAutostart(icon):
-    toggleAutostartInConfig()
     new_menu = (
         item(itemTitle, toggleAutostart),
         item(
@@ -79,7 +74,7 @@ def initTray():
         itemTitle = "Enable Autostart"
 
     menu = (
-        item(title, iconTrayClicked, default=True, visible=False),
+        item(dH.APP_NAME, iconTrayClicked, default=True, visible=False),
         item(itemTitle, toggleAutostart),
         item(
             "Save current monitor layout (used when enabling)",
@@ -100,5 +95,5 @@ def initTray():
     else:
         firstImageIcon = imageIconDisabled
 
-    icon = pystray.Icon(title, firstImageIcon, title, menu)
+    icon = pystray.Icon(dH.APP_NAME, firstImageIcon, dH.APP_NAME, menu)
     icon.run()

SimpleMonitorControlTray/registryHandler.py renamed to SimpleMonitorControlTrayModule/registryHandler.py

@@ -1,7 +1,7 @@
 [SETTINGS]
 monitor_name = \\.\DISPLAY3
 multimonitorpath = C:\\App_Install\\multimonitortool-x64\\MultiMonitorTool.exe
-autostart = True
+autostart = False
 
 [DEV]
 mm_csv_export_path = MultiMonitorTool\multiMonitorToolOutput.csv