Merge branch 'main' into main

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
         - label: I have searched existing issues
         - label: This issue is not a duplicate of an existing one
         - label: I have checked the [common issues section in the readme file](https://github.com/SteamDeckHomebrew/decky-loader#-common-issues)
-        - label: I have attached logs to this bug report (failure to include logs will mean your issue will not be responded too).
+        - label: I have attached logs to this bug report (failure to include logs will mean your issue may not be responded to).
 
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Steam Deck Homebrew Discord Server
-    url: https://discord.gg/ZU74G2NJzk
+    url: https://decky.xyz/discord
     about: Please ask and answer questions here.

.github/workflows/build-win.yml

@@ -0,0 +1,58 @@
+name: Builder Win
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: write
+
+jobs:
+  build-win:
+    name: Build PluginLoader for Win
+    runs-on: windows-2022
+
+    steps:
+    - name: Checkout 🧰
+      uses: actions/checkout@v3
+
+    - name: Set up NodeJS 18 💎
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18
+
+    - name: Set up Python 3.11.4 🐍
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11.4"
+
+    - name: Install Python dependencies ⬇️
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller==5.13.0
+        pip install -r requirements.txt
+
+    - name: Install JS dependencies ⬇️
+      working-directory: ./frontend
+      run: |
+        npm i -g pnpm
+        pnpm i --frozen-lockfile
+
+    - name: Build JS Frontend 🛠️
+      working-directory: ./frontend
+      run: pnpm run build
+
+    - name: Build Python Backend 🛠️
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/legacy;/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
+
+    - name: Build Python Backend (noconsole) 🛠️
+      run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/legacy;/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
+
+    - name: Upload package artifact ⬆️
+      uses: actions/upload-artifact@v3
+      with:
+        name: PluginLoader Win
+        path: |
+          ./dist/PluginLoader.exe
+          ./dist/PluginLoader_noconsole.exe
+    

.github/workflows/build.yml

@@ -31,7 +31,7 @@ permissions:
 jobs:
   build:
     name: Build PluginLoader
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Print input
@@ -47,15 +47,32 @@ jobs:
       with:
         node-version: 18
 
-    - name: Set up Python 3.10.2 🐍
+    - name: Set up Python 3.10.6 🐍
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10.2"
-
+        python-version: "3.10.6"
+
+    - name: Upgrade SQLite 3 binary version to 3.42.0 🧑‍💻
+      run: >
+        cd /tmp &&
+        wget "https://www.sqlite.org/2023/sqlite-autoconf-3420000.tar.gz" &&
+        tar -xvzf sqlite-autoconf-3420000.tar.gz &&
+        cd /tmp/sqlite-autoconf-3420000 &&
+        ./configure --prefix=/usr --disable-static CFLAGS="-g" CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+          -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+          -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_STMTVTAB -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+          -DSQLITE_MAX_EXPR_DEPTH=10000 -DSQLITE_ENABLE_MATH_FUNCTIONS" &&
+        make &&
+        sudo make install &&
+        sudo cp /usr/lib/libsqlite3.so /usr/lib/x86_64-linux-gnu/ &&
+        sudo cp /usr/lib/libsqlite3.so.0 /usr/lib/x86_64-linux-gnu/ &&
+        sudo cp /usr/lib/libsqlite3.so.0.8.6 /usr/lib/x86_64-linux-gnu/ &&
+        rm -r /tmp/sqlite-autoconf-3420000
+
     - name: Install Python dependencies ⬇️
       run: |
         python -m pip install --upgrade pip
-        pip install pyinstaller==5.5
+        pip install pyinstaller==5.13.0
         [ -f requirements.txt ] && pip install -r requirements.txt
 
     - name: Install JS dependencies ⬇️
@@ -69,7 +86,7 @@ jobs:
       run: pnpm run build
 
     - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/legacy:/legacy --add-data ./plugin:/plugin ./backend/*.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/legacy:/legacy --add-data ./plugin:/plugin --hidden-import=sqlite3 ./backend/*.py
 
     - name: Upload package artifact ⬆️
       if: ${{ !env.ACT }}
@@ -84,49 +101,6 @@ jobs:
       with:
         path: ./dist/PluginLoader
 
-  build-win:
-    name: Build PluginLoader for Win
-    runs-on: windows-2022
-
-    steps:
-    - name: Checkout 🧰
-      uses: actions/checkout@v3
-
-    - name: Set up NodeJS 18 💎
-      uses: actions/setup-node@v3
-      with:
-        node-version: 18
-
-    - name: Set up Python 3.10.2 🐍
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10.2"
-
-    - name: Install Python dependencies ⬇️
-      run: |
-        python -m pip install --upgrade pip
-        pip install pyinstaller==5.5
-        pip install -r requirements.txt
-
-    - name: Install JS dependencies ⬇️
-      working-directory: ./frontend
-      run: |
-        npm i -g pnpm
-        pnpm i --frozen-lockfile
-
-    - name: Build JS Frontend 🛠️
-      working-directory: ./frontend
-      run: pnpm run build
-
-    - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/legacy;/legacy" --add-data "./plugin;/plugin" ./backend/main.py
-
-    - name: Upload package artifact ⬆️
-      uses: actions/upload-artifact@v3
-      with:
-        name: PluginLoader Win
-        path: ./dist/PluginLoader.exe
-
   release:
     name: Release stable version of the package
     if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'release' }}

README.md

@@ -35,6 +35,7 @@ For more information about Decky Loader as well as documentation and development
 ### 🤔 Common Issues
 
 - Syncthing may use port 8080 on Steam Deck, which Decky Loader needs to function. If you are using Syncthing as a service, please change its port to something else.
+  - 8384 is the recommended port for Syncthing.
 - If you are using any software that uses port 1337 or 8080, please change its port to something else or uninstall it.
 - Sometimes Decky will disappear on SteamOS updates. This can easily be fixed by just re-running the installer and installing the stable branch again. If this doesn't work, try installing the prerelease instead. If that doesn't work, then [check the existing issues](https://github.com/SteamDeckHomebrew/decky-loader/issues) and if there isn't one then you can [file a new issue](https://github.com/SteamDeckHomebrew/decky-loader/issues/new?assignees=&labels=bug&template=bug_report.yml&title=%5BBUG%5D+%3Ctitle%3E).
 

backend/browser.py

@@ -139,6 +139,8 @@ async def _install(self, artifact, name, version, hash):
 
         # Check if plugin is installed
         isInstalled = False
+        # Preserve plugin order before removing plugin (uninstall alters the order and removes the plugin from the list)
+        current_plugin_order = self.settings.getSetting("pluginOrder")[:]
         if self.loader.watcher:
             self.loader.watcher.disabled = True
         try:
@@ -191,16 +193,16 @@ async def _install(self, artifact, name, version, hash):
                     self.loader.plugins[name].stop()
                     self.loader.plugins.pop(name, None)
                 await sleep(1)
-
-                current_plugin_order = self.settings.getSetting("pluginOrder")
-                current_plugin_order.append(name)
+                if not isInstalled:
+                    current_plugin_order = self.settings.getSetting("pluginOrder")
+                    current_plugin_order.append(name)
                 self.settings.setSetting("pluginOrder", current_plugin_order)
                 logger.debug("Plugin %s was added to the pluginOrder setting", name)
                 self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder)
             else:
                 logger.fatal(f"Failed Downloading Remote Binaries")
         else:
-            self.log.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
+            logger.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
         if self.loader.watcher:
             self.loader.watcher.disabled = False
 

backend/locales/cs-CZ.json

@@ -215,7 +215,11 @@
             "alph_desc": "Abecedně (A do Z)",
             "title": "Procházet"
         },
-        "store_testing_cta": "Zvažte prosím testování nových pluginů, pomůžete tím týmu Decky Loader!"
+        "store_testing_cta": "Zvažte prosím testování nových pluginů, pomůžete tím týmu Decky Loader!",
+        "store_testing_warning": {
+            "desc": "Tento kanál obchodu můžete použít k testování nejnovějších verzí pluginů. Nezapomeňte zanechat zpětnou vazbu na GitHubu, aby bylo možné plugin aktualizovat pro všechny uživatele.",
+            "label": "Vítejte na testovacím kanálu obchodu"
+        }
     },
     "StoreSelect": {
         "custom_store": {
@@ -255,5 +259,9 @@
             "unknown": "Nastala neznámá chyba. Nezpracovaná chyba je: {{raw_error}}",
             "perm_denied": "Nemáte přístup k zadanému adresáři. Zkontrolujte, zda jako uživatel (deck na Steam Decku) máte odpovídající oprávnění pro přístup k dané složce/souboru."
         }
+    },
+    "TitleView": {
+        "settings_desc": "Otevřít nastavení Decky",
+        "decky_store_desc": "Otevřít obchod Decky"
     }
 }