Testing using UPX on Ubuntu builds. Introduced saving of files to same directory, with reusable model directory.

Infinitode · Infinitode · commit c77a60723b0d · 2025-03-10T17:54:27.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest] # [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - name: Checkout code
@@ -37,9 +37,11 @@ jobs:
       - name: Build for Linux
         if: matrix.os == 'ubuntu-latest'
         run: |
+          sudo apt-get install -y upx
+
           pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_ubuntu.zip:ffmpeg" --hidden-import="whisper" --add-data "whisper:whisper" --exclude-module tkinter --exclude-module PyQt5 \
             --add-data "web:web" --add-data "js:js" --add-data "index.html:." --add-data "launch.html:." --add-data "style.css:." \
-            --windowed main.py --version-file version_info.txt
+            --windowed main.py --version-file version_info.txt --upx-dir /usr/bin
 
           strip dist/Scriptify
 
diff --git a/main.py b/main.py
@@ -34,9 +34,15 @@
 else:
     base_path = os.path.abspath(".")
 
+# Determine the directory of the script or the executable
+if getattr(sys, 'frozen', False):
+    app_dir = os.path.dirname(sys.executable)
+else:
+    app_dir = os.path.dirname(os.path.abspath(__file__))
+
 # Set whisper download folder
-os.environ["WHISPER_DOWNLOAD_DIR"] = os.path.join(base_path, "models")
-os.environ["WHISPER_CACHE_DIR"] = os.path.join(base_path, "models")
+os.environ["WHISPER_DOWNLOAD_DIR"] = os.path.join(app_dir, "models")
+os.environ["WHISPER_CACHE_DIR"] = os.path.join(app_dir, "models")
 
 def extract_ffmpeg():
     """Extracts the correct FFmpeg binary for the OS and returns its path."""
@@ -292,7 +298,7 @@ def auto_backup(self):
             # Format the date and time to fit in a filename
             filename_time = now.strftime("%Y-%m-%d_%H-%M-%S")
             backup_filename = f"{sanitized_title}_{filename_time}_backup.scriptify"
-            backup_path = os.path.join(base_path, backup_filename)
+            backup_path = os.path.join(app_dir, backup_filename)
 
             # Prepare the data to be saved
             data = {
