Merge branch 'feature/building_updating'

SavageCore · SavageCore · commit dacd1bd0eaf8 · 2025-08-21T16:31:38.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+
+jobs:
+  pyinstaller-build-windows:
+    name: Build Windows x64 executable
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5
+        with:
+          python-version: ">=3.7 <3.13"
+          cache: 'pip'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Build with pyinstaller
+        run: |
+          pyinstaller -F -n XboxBackupManager-win64 -i icon.ico main.py --add-data "database/xbox360.json;database" --add-data "database/MobCatsOGXboxTitleIDs.db;database" --noconsole
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: XboxBackupManager-win64
+          path: dist/XboxBackupManager-win64.exe
+
+permissions:
+  contents: write
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,47 @@
+name: Build & Release
+
+on:
+  push:
+    tags:
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build_and_release:
+    name: Build packages and release
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: windows-latest
+            TARGET: windows
+            CMD_BUILD_MAIN: pyinstaller -F -n XboxBackupManager-win64 -i icon.ico main.py --add-data "database/xbox360.json;database" --add-data "database/MobCatsOGXboxTitleIDs.db;database" --noconsole
+            CMD_BUILD_UPDATER: pyinstaller -F -n updater -i icon.ico updater.py --noconsole
+            OUT_FILE_NAME_MAIN: XboxBackupManager-win64.exe
+            OUT_FILE_NAME_UPDATER: updater.exe
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5
+        with:
+          python-version: ">=3.7 <3.13"
+          cache: 'pip'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Build main executable with pyinstaller for ${{matrix.TARGET}}
+        run: ${{matrix.CMD_BUILD_MAIN}}
+      - name: Build updater executable with pyinstaller for ${{matrix.TARGET}}
+        run: ${{matrix.CMD_BUILD_UPDATER}}
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          generate_release_notes: true
+          prerelease: false
+          files: |
+            dist/${{matrix.OUT_FILE_NAME_MAIN}}
+            dist/${{matrix.OUT_FILE_NAME_UPDATER}}
+
+permissions:
+  contents: write
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,25 @@
+name: Test
+
+on:
+    push:
+      branches:
+        - "**"
+    pull_request:
+
+jobs:
+    lint:
+        name: Lint
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v4
+        - name: Set up Python 3.x
+          uses: actions/setup-python@v5
+          with:
+            python-version: ">=3.7 <3.13"
+            cache: 'pip'
+        - name: Install dependencies
+          run: |
+            python -m pip install --upgrade pip
+            pip install -r requirements.txt
+        - name: Run black
+          run: black . --check
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 cache/
 __pycache__/
-XboxBackupManager.ini
+XboxBackupManager.ini
+build/
+dist/
+*.spec
diff --git a/constants.py b/constants.py
@@ -1,2 +1,7 @@
+import os
+import sys
+
 APP_NAME = "Xbox and Xbox 360 Backup Manager"
 VERSION = "0.0.0"
+REPO = "SavageCore/XboxBackupManager"
+APP_PATH = os.path.dirname(os.path.abspath(sys.executable))
diff --git a/database/xbox360_title_database.py b/database/xbox360_title_database.py
@@ -1,9 +1,10 @@
 import json
-import os
 from typing import Dict
 
 from PyQt6.QtCore import QObject, pyqtSignal
 
+from utils.resource_path import ResourcePath
+
 
 class TitleDatabaseLoader(QObject):
     """Handles loading and managing the Xbox title database"""
@@ -15,8 +16,9 @@ def __init__(self):
         super().__init__()
         self.title_database: Dict[str, str] = {}
 
-    def load_database(self, file_path: str = "database" + os.sep + "xbox360.json"):
+    def load_database(self):
         """Load the Xbox title database from file"""
+        file_path = ResourcePath.get_resource_path("database/xbox360.json")
         try:
             with open(file_path, "r", encoding="utf-8") as f:
                 database_list = json.load(f)
diff --git a/database/xbox_title_database.py b/database/xbox_title_database.py
@@ -12,6 +12,8 @@
 
 from PyQt6.QtCore import QObject, pyqtSignal
 
+from utils.resource_path import ResourcePath
+
 
 class XboxTitleDatabaseLoader(QObject):
     """Loads and manages Xbox title database from SQLite"""
@@ -21,7 +23,9 @@ class XboxTitleDatabaseLoader(QObject):
 
     def __init__(self):
         super().__init__()
-        self.database_path = "database" + os.sep + "MobCatsOGXboxTitleIDs.db"
+        self.database_path = ResourcePath.get_resource_path(
+            "database/MobCatsOGXboxTitleIDs.db"
+        )
         self.title_database: Dict[str, Dict[str, str]] = {}
         self.md5_cache: Dict[str, str] = {}  # Cache MD5s to avoid recalculating
 
diff --git a/main.py b/main.py
@@ -5,10 +5,12 @@
 
 from constants import APP_NAME, VERSION
 from ui.main_window import XboxBackupManager  # type: ignore
+from utils.github import auto_update  # type: ignore
 
 
 def main():
     """Main application entry point"""
+    # Initialize the application
     app = QApplication(sys.argv)
     app.setApplicationName(APP_NAME)
     app.setApplicationVersion(VERSION)
@@ -19,6 +21,9 @@ def main():
     except Exception:
         pass
 
+    # Check for updates
+    auto_update()
+
     window = XboxBackupManager()
     window.show()
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,9 @@
 black==25.1.0
 darkdetect==0.8.0
+psutil==7.0.0
+pyinstaller==6.15.0
 PyQt6==6.9.1
 qdarkstyle==3.2.3
 QtAwesome==1.4.0
-requests==2.32.5
+requests==2.32.5
+semver==3.0.4
diff --git a/updater.py b/updater.py
@@ -0,0 +1,43 @@
+import os
+import shutil
+import sys
+import time
+import subprocess
+import psutil
+
+exe_name = "XboxBackupManager-win64.exe"
+
+
+def is_process_running(exe_name):
+    for proc in psutil.process_iter(["name"]):
+        if proc.info["name"] == exe_name:
+            return True
+    return False
+
+
+def replace_and_restart(temp_exe):
+    # Wait for the main application to exit
+    while is_process_running(exe_name):
+        time.sleep(0.5)
+
+    # Ensure the new file is renamed to the proper executable name
+    new_exe_path = os.path.join(os.path.dirname(temp_exe), exe_name)
+    print(new_exe_path)
+
+    # Replace the old executable with the new one
+    os.remove(exe_name)
+    shutil.move(temp_exe, new_exe_path)
+
+    # Restart the application
+    subprocess.Popen([new_exe_path], cwd=os.path.dirname(new_exe_path))
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: updater.exe <temp_exe>")
+        sys.exit(1)
+
+    temp_exe = sys.argv[1]
+
+    replace_and_restart(temp_exe)
diff --git a/utils/github.py b/utils/github.py
@@ -0,0 +1,72 @@
+import os
+import subprocess
+import sys
+from datetime import datetime, timedelta
+
+import requests
+import semver
+
+from constants import APP_PATH, REPO, VERSION
+from utils.settings_manager import SettingsManager
+
+
+def check_for_update():
+    url = f"https://api.github.com/repos/{REPO}/releases/latest"
+    response = requests.get(url)
+    if response.status_code == 200:
+        latest_release = response.json()
+        return (
+            latest_release["tag_name"],
+            latest_release["assets"][1]["browser_download_url"],
+        )
+    return None, None
+
+
+def download_update(download_url, output_path):
+    response = requests.get(download_url, stream=True)
+    with open(output_path, "wb") as f:
+        for chunk in response.iter_content(chunk_size=8192):
+            if chunk:
+                f.write(chunk)
+
+
+def auto_update():
+    updater_path = os.path.join(APP_PATH, "updater.exe")
+    settings_manager = SettingsManager()
+
+    if not os.path.exists(updater_path):
+        download_update(
+            "https://github.com/SavageCore/XboxBackupManager/releases/latest/download/updater.exe",
+            updater_path,
+        )
+
+    last_update_check = settings_manager.settings.value("last_update_check")
+    if last_update_check:
+        last_update_check = datetime.fromisoformat(last_update_check)
+        time_since_last_check = datetime.now() - last_update_check
+        if time_since_last_check < timedelta(hours=1):
+            return
+
+    latest_version, download_url = check_for_update()
+    if latest_version is None:
+        return
+    latest_version = latest_version[1:]
+
+    if semver.compare(VERSION, latest_version) == -1:
+        # Download the latest updater
+        download_update(
+            "https://github.com/SavageCore/XboxBackupManager/releases/latest/download/updater.exe",
+            updater_path,
+        )
+
+        temp_path = os.path.join(APP_PATH, "update_temp.exe")
+        download_update(download_url, temp_path)
+
+        settings_manager.settings.setValue(
+            "last_update_check", datetime.now().isoformat()
+        )
+
+        subprocess.Popen([updater_path, temp_path])
+        sys.exit(0)
+
+    settings_manager.settings.setValue("last_update_check", datetime.now().isoformat())
diff --git a/utils/resource_path.py b/utils/resource_path.py
@@ -0,0 +1,12 @@
+import os
+import sys
+
+
+class ResourcePath:
+    @staticmethod
+    def get_resource_path(relative_path):
+        """Get the absolute path to a resource, works for dev and PyInstaller."""
+        if hasattr(sys, "_MEIPASS"):
+            # Running in a PyInstaller bundle
+            return os.path.join(sys._MEIPASS, relative_path)
+        return os.path.join(os.path.abspath("."), relative_path)
