assets now get downloaded if missing, modified how config variables work

Author: wrecks-code

.gitignore

@@ -153,5 +153,5 @@ cython_debug/
 
 output/
 .vscode/
-temp/
+mmt/
 config.ini

assets2/icon.ico

@@ -2,7 +2,7 @@
 
 
 def main():
-    config.read_config()
+    config.init_config()
     tray.init_tray()
 
 

assets2/iconDisabled.png

@@ -1,106 +1,140 @@
 import configparser
 import os
-import sys
-
-from smct import (
-    notification,
-    paths,
-    registry,
-    ui,
-    ui_strings,
-)
-
-ENCODING = "utf-8"
-
-# keys
-SETTINGS_SECTION = "Settings"
-MONITOR_NAME_KEY = "monitor_name"
-MONITOR_SERIAL_KEY = "monitor_serial"
-MMT_PATH_KEY = "multimonitortool_executable"
-START_WITH_WINDOWS_KEY = "start_with_windows"
-FIRT_START_KEY = "first_start"
-
-# values
-MMT_PATH_VALUE = ""
-MONITOR_NAME_VALUE = ""
-MONITOR_SERIAL_VALUE = ""
-START_WITH_WINDOWS_VALUE = False
-FIRST_START_VALUE = True
+
+import requests
+
+from smct import paths, registry, ui
+
+# config.ini structure
+_ENCODING = "utf-8"
+
+_SETTINGS_SECTION = "Settings"
+
+_MONITOR_NAME_KEY = "monitor_name"
+_MONITOR_SERIAL_KEY = "monitor_serial"
+_MMT_PATH_KEY = "multimonitortool_executable"
+_START_WITH_WINDOWS_KEY = "start_with_windows"
+_FIRST_START_KEY = "first_start"
 
 _configparser = configparser.ConfigParser()
 
 
-def check_for_missing_files():
+def _check_for_missing_files():
+    if not os.path.exists(paths.ASSETS_DIR_PATH):
+        os.mkdir(paths.ASSETS_DIR_PATH)
+
     # Check for Icons
+    # ! maybe send error message here?
+    if not os.path.exists(paths.ASSETS_ICO_PATH):
+        download_assets_file(os.path.basename(paths.ASSETS_ICO_PATH))
+        # sys.exit(1)
     if not os.path.exists(paths.ASSETS_ICON_ENABLED_PATH):
-        notification.send_error(
-            paths.ASSETS_ICON_ENABLED_PATH + ui_strings.FILE_NOT_FOUND
-        )
-        sys.exit(1)
+        download_assets_file(os.path.basename(paths.ASSETS_ICON_ENABLED_PATH))
+        # sys.exit(1)
     if not os.path.exists(paths.ASSETS_ICON_DISABLED_PATH):
-        notification.send_error(
-            paths.ASSETS_ICON_DISABLED_PATH + ui_strings.FILE_NOT_FOUND
-        )
-        sys.exit(1)
+        download_assets_file(os.path.basename(paths.ASSETS_ICON_DISABLED_PATH))
+        # sys.exit(1)
 
     # Check for temp folder
-    if not os.path.exists(paths.TEMP_DIR_PATH):
-        os.makedirs(paths.TEMP_DIR_PATH)
+    if not os.path.exists(paths.MMT_DIR_PATH):
+        os.makedirs(paths.MMT_DIR_PATH)
 
 
-def read_config():
-    # Check if config.ini file is present
-    if not os.path.exists(paths.CONFIG_PATH):
-        _create_default_config_file()
+def download_assets_file(image_name):
+    image_url = paths.ASSETS_BASE_URL + image_name
+    response = requests.get(image_url, stream=True, timeout=5)
+
+    if response.status_code == 200:
+        filename = response.url.split("/")[-1]
 
-    _configparser.read(paths.CONFIG_PATH, encoding=ENCODING)
+        with open(os.path.join(paths.ASSETS_DIR_PATH, filename), "wb") as f:
+            for chunk in response.iter_content(1024):
+                f.write(chunk)
 
-    # * pylint: disable=global-statement
-    global START_WITH_WINDOWS_VALUE, MMT_PATH_VALUE, MONITOR_NAME_VALUE, MONITOR_SERIAL_VALUE, FIRST_START_VALUE
 
-    MMT_PATH_VALUE = _configparser.get(SETTINGS_SECTION, MMT_PATH_KEY)
-    MONITOR_NAME_VALUE = _configparser.get(SETTINGS_SECTION, MONITOR_NAME_KEY)
-    MONITOR_SERIAL_VALUE = _configparser.get(SETTINGS_SECTION, MONITOR_SERIAL_KEY)
-    START_WITH_WINDOWS_VALUE = _configparser.getboolean(
-        SETTINGS_SECTION, START_WITH_WINDOWS_KEY
-    )
-    FIRST_START_VALUE = _configparser.getboolean(SETTINGS_SECTION, FIRT_START_KEY)
+def init_config():
+    if not os.path.exists(paths.CONFIG_PATH):
+        _create_default_config_file()
 
-    check_for_missing_files()
+    _check_for_missing_files()
 
-    if START_WITH_WINDOWS_VALUE:
+    if get_start_with_windows_value():
         registry.add_to_autostart()
     else:
         registry.remove_from_autostart()
 
-    if FIRST_START_VALUE:
+    if get_first_start_with_windows_value():
         ui.init_mmt_selection_frame()
-        FIRST_START_VALUE = False
-        set_config_value(SETTINGS_SECTION, FIRT_START_KEY, FIRST_START_VALUE)
+        set_first_start_value(False)
 
 
-def _create_default_config_file():
-    _configparser["Settings"] = {
-        MONITOR_NAME_KEY: "Example Monitor",
-        MONITOR_SERIAL_KEY: "12345",
-        MMT_PATH_KEY: "C:/MultiMonitorTool.exe",
-        START_WITH_WINDOWS_KEY: "no",
-        FIRT_START_KEY: "yes",
-    }
-    with open(paths.CONFIG_PATH, "w", encoding=ENCODING) as _file_object:
-        _configparser.write(_file_object)
+def get_mmt_path_value():
+    _read_from_config()
+    return _configparser.get(_SETTINGS_SECTION, _MMT_PATH_KEY)
 
 
-def set_config_value(section, key, value):
-    if isinstance(value, bool):
-        value_str = "yes" if value else "no"
-    else:
-        value_str = str(value)
-    _configparser[section][key] = value_str
-    with open(paths.CONFIG_PATH, "w", encoding=ENCODING) as configfile:
+def set_mmt_path_value(_value):
+    _configparser[_SETTINGS_SECTION][_MMT_PATH_KEY] = _value
+    _write_to_config()
+
+
+def get_monitor_name_value():
+    _read_from_config()
+    return _configparser.get(_SETTINGS_SECTION, _MONITOR_NAME_KEY)
+
+
+def set_monitor_name_value(_value):
+    _configparser[_SETTINGS_SECTION][_MONITOR_NAME_KEY] = _value
+    _write_to_config()
+
+
+def get_monitor_serial_value():
+    _read_from_config()
+    return _configparser.get(_SETTINGS_SECTION, _MONITOR_SERIAL_KEY)
+
+
+def set_monitor_serial_value(_value):
+    _configparser[_SETTINGS_SECTION][_MONITOR_SERIAL_KEY] = _value
+    _write_to_config()
+
+
+def get_start_with_windows_value():
+    _read_from_config()
+    return _configparser.getboolean(_SETTINGS_SECTION, _START_WITH_WINDOWS_KEY)
+
+
+def set_start_with_windows_value(_value):
+    value_str = "yes" if _value else "no"
+    _configparser[_SETTINGS_SECTION][_START_WITH_WINDOWS_KEY] = value_str
+    _write_to_config()
+
+
+def get_first_start_with_windows_value():
+    _read_from_config()
+    return _configparser.getboolean(_SETTINGS_SECTION, _FIRST_START_KEY)
+
+
+def set_first_start_value(_value):
+    value_str = "yes" if _value else "no"
+    _configparser[_SETTINGS_SECTION][_FIRST_START_KEY] = value_str
+    _write_to_config()
+
+
+def _read_from_config():
+    _configparser.read(paths.CONFIG_PATH, encoding=_ENCODING)
+
+
+def _write_to_config():
+    with open(paths.CONFIG_PATH, "w", encoding=_ENCODING) as configfile:
         _configparser.write(configfile)
-    # print("Setting config value: " + key + " to " + value)
 
 
-def get_config_value(section, key):
-    return _configparser.get(section, key)
+def _create_default_config_file():
+    _configparser[_SETTINGS_SECTION] = {
+        _MONITOR_NAME_KEY: "Example Monitor",
+        _MONITOR_SERIAL_KEY: "12345",
+        _MMT_PATH_KEY: "C:/MultiMonitorTool.exe",
+        _START_WITH_WINDOWS_KEY: "no",
+        _FIRST_START_KEY: "yes",
+    }
+    _write_to_config()

assets2/iconEnabled.png

@@ -1,40 +1,48 @@
 import subprocess
-
 import pandas as pd
 from smct import config, paths
 
-
-def _get_monitor_df():
-    _run_mmt_command("/scomma", paths.MMT_CSV_PATH)
-    _monitor_df = []
-
-    data = pd.read_csv(paths.MMT_CSV_PATH)
-    for index in range(len(data)):
-        _monitor_df.append(data.iloc[index])
-    return _monitor_df
+MMT_CSV_MONITOR_NAME = "Monitor Name"
+MMT_CSV_SERIAL_NUMBER = "Monitor Serial Number"
+MMT_CSV_NAME = "Name"
+MMT_CSV_ACTIVE = "Active"
+MMT_CSV_YES = "yes"
+MMT_CSV_NO = "no"
 
 
 def get_monitor_selection_list():
     _monitor_selection_list = []
-    for _monitor in _get_monitor_df():
-        _monitor_name = _monitor["Monitor Name"]
-        _monitor_serial = _monitor["Monitor Serial Number"]
-        _monitor_selection_list.append(f"{_monitor_name} | {_monitor_serial}")
+    monitor_df = _get_monitor_df()
+    # pylint: disable=unused-variable
+    for index, row in monitor_df.iterrows():
+        _monitor_id = row[MMT_CSV_NAME][-1]
+        _monitor_name = row[MMT_CSV_MONITOR_NAME]
+        _monitor_serial = row[MMT_CSV_SERIAL_NUMBER]
+        _monitor_selection_list.append(
+            f"{_monitor_id} | {_monitor_name} | {_monitor_serial}"
+        )
+        _monitor_selection_list.sort()
     return _monitor_selection_list
 
 
+def _get_monitor_df():
+    _run_mmt_command("/scomma", paths.MMT_CSV_PATH)
+    data = pd.read_csv(paths.MMT_CSV_PATH)
+    return data
+
+
 def _run_mmt_command(command, destination):
     try:
         subprocess.run(
             [
-                config.MMT_PATH_VALUE,
+                config.get_mmt_path_value(),
                 command,
                 destination,
             ],
             check=True,
         )
     except subprocess.CalledProcessError as error:
-        print(f"{config.MMT_PATH_VALUE} {command} {destination} failed: {error}")
+        print(f"{config.get_mmt_path_value} {command} {destination} failed: {error}")
 
 
 def save_mmt_config():
@@ -46,39 +54,44 @@ def enable_monitor():
 
 
 def disable_monitor():
-    _run_mmt_command("/disable", get_selected_monitor_id())
+    selected_monitor_id = get_selected_monitor_id()
+    if selected_monitor_id:
+        _run_mmt_command("/disable", selected_monitor_id)
 
 
 def enable_all_disabled_monitors():
-    for _monitor_id in _get_all_disabled_monitor_ids():
+    disabled_monitor_ids = _get_all_disabled_monitor_ids()
+    for _monitor_id in disabled_monitor_ids:
         _run_mmt_command("/enable", _monitor_id)
 
 
 def get_selected_monitor_id():
-    for monitor in _get_monitor_df():
+    # pylint: disable=unused-variable
+    for index, monitor in _get_monitor_df().iterrows():
         if (
-            monitor["Monitor Name"] == config.MONITOR_NAME_VALUE
-            and str(monitor["Monitor Serial Number"]) == config.MONITOR_SERIAL_VALUE
+            monitor[MMT_CSV_MONITOR_NAME] == config.get_monitor_name_value()
+            and str(monitor[MMT_CSV_SERIAL_NUMBER]) == config.get_monitor_serial_value()
         ):
-            _id = monitor["Name"]
-            return _id[-1]
+            return monitor[MMT_CSV_NAME][-1]
 
 
 def _get_all_disabled_monitor_ids():
-    _monitor_id_list = []
-    for monitor in _get_monitor_df():
-        if monitor["Active"].upper() == "NO":
-            _id = monitor["Name"]
-            _monitor_id_list.append(_id[-1])
-    return _monitor_id_list
+    monitor_df = _get_monitor_df()
+    disabled_monitor_ids = []
+    # pylint: disable=unused-variable
+    for index, monitor in monitor_df.iterrows():
+        if monitor[MMT_CSV_ACTIVE].lower() == MMT_CSV_NO:
+            disabled_monitor_ids.append(monitor[MMT_CSV_NAME][-1])
+    return disabled_monitor_ids
 
 
 def is_selected_monitor_enabled():
-    for monitor in _get_monitor_df():
+    # pylint: disable=unused-variable
+    for index, monitor in _get_monitor_df().iterrows():
         if (
-            monitor["Monitor Name"] == config.MONITOR_NAME_VALUE
-            and str(monitor["Monitor Serial Number"]) == config.MONITOR_SERIAL_VALUE
-            and monitor["Active"].upper() == "YES"
+            monitor[MMT_CSV_MONITOR_NAME] == config.get_monitor_name_value()
+            and str(monitor[MMT_CSV_SERIAL_NUMBER]) == config.get_monitor_serial_value()
+            and monitor[MMT_CSV_ACTIVE].lower() == MMT_CSV_YES
         ):
             return True
     return False

main.py

@@ -24,12 +24,15 @@ def strip_package_name_from_path(path):
 BASE_PATH = get_base_path()
 EXE_PATH = BASE_PATH + "\\" + ui_strings.APP_NAME + ".exe"
 
-CONFIG_PATH = BASE_PATH + r"\config.ini"
-ASSETS_DIR_PATH = BASE_PATH + r"\assets"
-TEMP_DIR_PATH = BASE_PATH + r"\temp"
-
-MMT_CSV_PATH = TEMP_DIR_PATH + r"\MultiMonitorToolOutput.csv"
-MMT_CONFIG_PATH = TEMP_DIR_PATH + r"\MultiMonitorToolConfig"
-ASSETS_ICON_ENABLED_PATH = ASSETS_DIR_PATH + r"\iconEnabled.png"
-ASSETS_ICON_DISABLED_PATH = ASSETS_DIR_PATH + r"\iconDisabled.png"
-ASSETS_ICO_PATH = ASSETS_DIR_PATH + r"\icon.ico"
+CONFIG_PATH = BASE_PATH + "\\config.ini"
+ASSETS_DIR_PATH = BASE_PATH + "\\assets"
+MMT_DIR_PATH = BASE_PATH + "\\mmt"
+
+MMT_CSV_PATH = MMT_DIR_PATH + "\\MultiMonitorToolOutput.csv"
+MMT_CONFIG_PATH = MMT_DIR_PATH + "\\MultiMonitorToolConfig"
+
+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"
+
+ASSETS_BASE_URL = "https://raw.githubusercontent.com/wrecks-code/SimpleMonitorControlTray/main/assets/"