Improve --update and --debug flags, fix file comparison and edge cases

- Fixed crash when Git is not installed by implementing a proper existence check
- Resolved issue where --debug misidentified ignored files as extra
- Unified file comparison logic in --debug with _dev.py logic to avoid mismatches
- Enhanced debug logging for better clarity and traceability
- Fixed dev mode bug where, after max attempts, input was ignored even if valid
- Added support for Python 3.13 in debug, thus no error will be thrown in the menu

Signed-off-by: Shahm Najeeb <[email protected]>

Author: DefinetlyNotAI

CODE/Logicytics.py

@@ -264,12 +264,18 @@ def update() -> tuple[str, str]:
                 str: The output from the git pull command.
             """
         # Check if git command is available
-        if subprocess.run(["git", "--version"], capture_output=True).returncode != 0:
+        try:
+            if subprocess.run(["git", "--version"], capture_output=True).returncode != 0:
+                return "Git is not installed or not available in the PATH.", "error"
+        except FileNotFoundError:
             return "Git is not installed or not available in the PATH.", "error"
 
         # Check if the project is a git repository
-        if not os.path.exists(os.path.join(os.getcwd(), "../.git")):
-            return "This project is not a git repository. The update flag uses git.", "error"
+        try:
+            if not os.path.exists(os.path.join(os.getcwd(), "../.git")):
+                return "This project is not a git repository. The update flag uses git.", "error"
+        except Exception as e:
+            return f"Error checking for git repository: {e}", "error"
 
         current_dir = os.getcwd()
         parent_dir = os.path.dirname(current_dir)

CODE/_debug.py

@@ -9,7 +9,7 @@
 import psutil
 import requests
 
-from logicytics import Log, DEBUG, VERSION, check, config
+from logicytics import Log, DEBUG, VERSION, check, config, get
 
 log_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "ACCESS\\LOGS\\DEBUG\\DEBUG.log")
 log = Log({"log_level": DEBUG, "filename": log_path, "truncate_message": False, "delete_log": True})
@@ -47,14 +47,16 @@ def check_required_files(directory: str, required_files: list[str]):
                 log.error(f"Directory {directory} does not exist.")
                 return
 
-            actual_files = []
-            for root, _, files in os.walk(directory):
-                for file in files:
-                    relative_path = os.path.relpath(os.path.join(root, file), start=directory)
-                    actual_files.append(relative_path.replace("\\", "/").replace('"', ''))  # Normalize paths
+            # Use get.list_of_files to retrieve files, excluding specified files, dirs, and extensions
+            actual_files = get.list_of_files(
+                directory,
+                exclude_files=["logicytics/User_History.json.gz", "logicytics/User_History.json"],
+                exclude_dirs=["SysInternal_Suite"],
+                exclude_extensions=[".pyc"]
+            )
+            actual_files = [f.replace("\\", "/").replace('"', '') for f in actual_files]  # Normalize paths
 
             log.debug(f"Actual files found: {actual_files}")
-
             # Strip quotes and normalize paths for comparison
             normalized_required_files = [
                 required_file.strip().replace("\\", "/").replace('"', '')  # Remove quotes and normalize paths
@@ -130,19 +132,21 @@ def python_version():
         """
         version = sys.version.split()[0]
         MIN_VERSION = (3, 11)
-        MAX_VERSION = (3, 13)
+        MAX_VERSION = (3, 14)
         try:
             major, minor = map(int, version.split(".")[:2])
             if MIN_VERSION <= (major, minor) < MAX_VERSION:
-                log.info(f"Python Version: {version} - Perfect")
+                if (major, minor) == MIN_VERSION:
+                    log.info(f"Python Version: {version} - Perfect (mainly tested on 3.11.x)")
+                else:
+                    log.info(f"Python Version: {version} - Supported")
             elif (major, minor) < MIN_VERSION:
                 log.warning(f"Python Version: {version} - Recommended: 3.11.x")
             else:
                 log.error(f"Python Version: {version} - Incompatible")
         except Exception as e:
             log.error(f"Failed to parse Python Version: {e}")
 
-
 class ConfigManager:
     @staticmethod
     def get_online_config() -> dict | None:
@@ -206,8 +210,8 @@ def debug():
     SysInternalManager.check_binaries("SysInternal_Suite")
 
     # System Checks
-    log.info("Admin privileges found" if check.admin() else "Admin privileges not found")
-    log.info("UAC enabled" if check.uac() else "UAC disabled")
+    log.info("Admin privileges found") if check.admin() else log.warning("Admin privileges not found")
+    log.info("UAC enabled") if check.uac() else log.warning("UAC disabled")
     log.info(f"Execution path: {psutil.__file__}")
     log.info(f"Global execution path: {sys.executable}")
     log.info(f"Local execution path: {sys.prefix}")

CODE/_dev.py

@@ -150,12 +150,13 @@ def _handle_file_operations() -> None:
     while True:
         version = color_print(f"[?] Enter the new version of the project (Old version is {VERSION}): ", "cyan",
                               is_input=True)
-        if attempts >= max_attempts:
-            color_print("[x] Maximum attempts reached. Please run the script again.", "red")
-            exit()
+
         if re.match(r"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$", version):
             _update_ini_file("config.ini", version, "version")
             break
+        elif attempts >= max_attempts:
+            color_print("[x] Maximum attempts reached. Please run the script again.", "red")
+            exit()
         else:
             color_print("[!] Please enter a valid version number (e.g., 1.2.3)", "yellow")
             attempts += 1