Update README.md

* Changed back to a while loop for grabbing the scroll root\nAs recursive function exits before it hits 30 iterations in testing.

* Changed so if recursive limit is hit, it returns null instead of attempting to continue.

* Added log messages regarding recursion limits, as well as fixed recursion tracking.

* Removed errant return remaining from scroll root check.

.github/workflows/build.yml

@@ -15,6 +15,15 @@ on:
           - none
           - prerelease
           - release
+      bump:
+        type: choice
+        description: Semver to bump
+        default: 'none'
+        options:
+          - none
+          - patch
+          - minor
+          - major
 
 permissions:
   contents: write
@@ -25,6 +34,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Print input
+      run : |
+        echo "release: ${{ github.event.inputs.release }}\n"
+        echo "bump: ${{ github.event.inputs.bump }}\n"
+
     - name: Checkout 🧰
       uses: actions/checkout@v3
 
@@ -106,11 +120,26 @@ jobs:
         if [[ "$VERSION" =~ "-pre" ]]; then
           printf "is prerelease, bumping to release\n"
           OUT=$(semver bump release "$VERSION")
-          printf "OUT: ${OUT}\n"
+          printf "OUT: ${OUT}\n"\
+          printf "bumping by selected type.\n"
+          if [[ "${{github.event.inputs.bump}}" != "none" ]]; then
+            OUT=$(semver bump ${{github.event.inputs.bump}} "$OUT")
+            printf "OUT: ${OUT}\n"
+          else
+            printf "no type selected, defaulting to patch.\n"
+            OUT=$(semver bump patch "$OUT")
+            printf "OUT: ${OUT}\n"
+          fi
         elif [[ ! "$VERSION" =~ "-pre" ]]; then
-          printf "previous tag is a release, bumping by a patch\n"
-          OUT=$(semver bump patch "$VERSION")
-          printf "OUT: ${OUT}\n" 
+          printf "previous tag is a release, bumping by selected type.\n"
+          if [[ "${{github.event.inputs.bump}}" != "none" ]]; then
+            OUT=$(semver bump ${{github.event.inputs.bump}} "$VERSION")
+            printf "OUT: ${OUT}\n"
+          else
+            printf "previous tag is a release, but no bump selected. Defaulting to a patch bump.\n"
+            OUT=$(semver bump patch "$VERSION")
+            printf "OUT: ${OUT}\n"
+          fi
         fi
         echo "vOUT: v$OUT"
         echo ::set-output name=tag_name::v$OUT
@@ -138,7 +167,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
 
-    steps:    
+    steps:
     - name: Checkout 🧰
       uses: actions/checkout@v3
 
@@ -170,16 +199,38 @@ jobs:
         echo "VERS: $VERSION"
         OUT=""
         if [[ ! "$VERSION" =~ "-pre" ]]; then
-          printf "is release, bumping  minor version and prerel\n"
-          OUT=$(semver bump patch "$VERSION")
+          printf "pre-release from release, bumping by selected type and prerel\n"
+          if [[ ! ${{ github.event.inputs.bump }} == "none" ]]; then
+            OUT=$(semver bump ${{github.event.inputs.bump}} "$VERSION")
+            printf "OUT: ${OUT}\n"
+          else
+            printf "type not selected, defaulting to patch\n"
+            OUT=$(semver bump patch "$VERSION")
+            printf "OUT: ${OUT}\n"
+          fi
           OUT="$OUT-pre"
           OUT=$(semver bump prerel "$OUT")
           printf "OUT: ${OUT}\n"
         elif [[ "$VERSION" =~ "-pre" ]]; then
-          printf "is a prerelease, bumping prerel\n"
-          OUT=$(semver bump prerel "$VERSION")
-          printf "OUT: ${OUT}\n"
+          printf "pre-release to pre-release, bumping by selected type and or prerel version\n"
+          if [[ ! ${{ github.event.inputs.bump }} == "none" ]]; then
+            OUT=$(semver bump ${{github.event.inputs.bump}} "$VERSION")
+            printf "OUT: ${OUT}\n"
+            OUT="$OUT-pre"
+            printf "OUT: ${OUT}\n"
+            printf "bumping prerel\n"
+            OUT=$(semver bump prerel "$OUT")
+            printf "OUT: ${OUT}\n"
+          else
+            printf "type not selected, defaulting to new pre-release only\n"
+            printf "bumping prerel\n"
+            OUT="$VERSION-pre"
+            printf "OUT: ${OUT}\n"
+            OUT=$(semver bump prerel "$OUT")
+            printf "OUT: ${OUT}\n"
+          fi
         fi
+        printf "vOUT: v${OUT}\n"
         echo ::set-output name=tag_name::v$OUT
 
     - name: Push tag 📤

README.md

@@ -12,10 +12,11 @@ Keep an eye on the [Wiki](https://deckbrew.xyz) for more information about Decky
 5. Confirm dialog and wait for system reboot
 6. Click on the `STEAM` button and select `Power` -> `Switch to Desktop`
 7. Make sure you have a password set with the "passwd" command in terminal to install it ([YouTube Guide](https://www.youtube.com/watch?v=1vOMYGj22rQ)).
+    - It will look like the password isn't typing properly. That's normal, it's a security feature (Similar to `***` when typing passwords online)
 8. Open a terminal ("Konsole" is the pre-installed terminal application) and paste the following command into it:
-    - For the latest release:
+    - For the latest release (recommended for all users):
         - `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_release.sh | sh`
-    - For the latest pre-release:
+    - For the latest pre-release (testing releases, unlikely to be fully stable):
         - `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_prerelease.sh | sh`
     - For testers/plugin developers:
         - `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_prerelease.sh | sh`

act/prerelease.json

@@ -1,5 +1,6 @@
 {
   "inputs": {
-    "release": "prerelease"
+    "release": "prerelease",
+    "bump": "none"
   }
 }

act/release.json

@@ -1,5 +1,6 @@
 {
   "inputs": {
-    "release": "release"
+    "release": "release",
+    "bump": "none"
   }
 }

act/run-act.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 type=$1
+# bump=$2
 
 oldartifactsdir="old"
 

backend/loader.py

@@ -25,7 +25,7 @@ class FileChangeHandler(RegexMatchingEventHandler):
         self.logger = getLogger("file-watcher")
         self.plugin_path = plugin_path
         self.queue = queue
-        self.disabled = False
+        self.disabled = True
 
     def maybe_reload(self, src_path):
         if self.disabled:
@@ -70,6 +70,7 @@ class Loader:
         self.logger.info(f"plugin_path: {self.plugin_path}")
         self.plugins = {}
         self.watcher = None
+        self.live_reload = live_reload
 
         if live_reload:
             self.reload_queue = Queue()
@@ -78,6 +79,7 @@ class Loader:
             self.observer.schedule(self.watcher, self.plugin_path, recursive=True)
             self.observer.start()
             self.loop.create_task(self.handle_reloads())
+            self.loop.create_task(self.enable_reload_wait())
 
         server_instance.add_routes([
             web.get("/frontend/{path:.*}", self.handle_frontend_assets),
@@ -92,6 +94,12 @@ class Loader:
             web.get("/steam_resource/{path:.+}", self.get_steam_resource)
         ])
 
+    async def enable_reload_wait(self):
+        if self.live_reload:
+            await sleep(10)
+            self.logger.info("Hot reload enabled")
+            self.watcher.disabled = False
+
     async def handle_frontend_assets(self, request):
         file = path.join(path.dirname(__file__), "static", request.match_info["path"])
 

backend/main.py

@@ -1,9 +1,13 @@
+# Change PyInstaller files permissions
+import sys
+from subprocess import call
+if hasattr(sys, '_MEIPASS'):
+    call(['chmod', '-R', '755', sys._MEIPASS])
 # Full imports
 from asyncio import get_event_loop, sleep
 from json import dumps, loads
 from logging import DEBUG, INFO, basicConfig, getLogger
-from os import getenv, path
-from subprocess import call
+from os import getenv, chmod
 from traceback import format_exc
 
 import aiohttp_cors

frontend/src/components/store/PluginCard.tsx

@@ -113,8 +113,22 @@ const PluginCard: FC<PluginCardProps> = ({ plugin }) => {
             }}
             className="deckyStoreCardInfo"
           >
-            <p className={joinClassNames(staticClasses.PanelSectionRow)}>
-              <span>Author: {plugin.author}</span>
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
+              style={{ marginTop: '0px', marginLeft: '16px' }}
+            >
+              <span style={{ paddingLeft: '0px' }}>Author: {plugin.author}</span>
+            </p>
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
+              style={{
+                marginLeft: '16px',
+                marginTop: '0px',
+                marginBottom: '0px',
+                marginRight: '16px',
+              }}
+            >
+              <span style={{ paddingLeft: '0px' }}>{plugin.description}</span>
             </p>
             <p
               className={joinClassNames('deckyStoreCardTagsContainer', staticClasses.PanelSectionRow)}

frontend/src/tabs-hook.ts

@@ -49,23 +49,29 @@ class TabsHook extends Logger {
     let scrollRoot: any;
     async function findScrollRoot(currentNode: any, iters: number): Promise<any> {
       if (iters >= 30) {
-        await sleep(5000);
-        return await findScrollRoot(tree, 0);
+        self.error(
+          'Scroll root was not found before hitting the recursion limit, a developer will need to increase the limit.',
+        );
+        return null;
       }
       currentNode = currentNode?.child;
-      if (currentNode?.type?.prototype?.RemoveSmartScrollContainer) return currentNode;
+      if (currentNode?.type?.prototype?.RemoveSmartScrollContainer) {
+        self.log(`Scroll root was found in ${iters} recursion cycles`);
+        return currentNode;
+      }
       if (!currentNode) return null;
       if (currentNode.sibling) {
-        let node = await findScrollRoot(currentNode.sibling, iters++);
+        let node = await findScrollRoot(currentNode.sibling, iters + 1);
         if (node !== null) return node;
       }
-      return await findScrollRoot(currentNode, iters++);
+      return await findScrollRoot(currentNode, iters + 1);
     }
     (async () => {
       scrollRoot = await findScrollRoot(tree, 0);
-      if (!scrollRoot) {
-        this.error('Failed to find scroll root node!');
-        return;
+      while (!scrollRoot) {
+        this.log('Failed to find scroll root node, reattempting in 5 seconds');
+        await sleep(5000);
+        scrollRoot = await findScrollRoot(tree, 0);
       }
       let newQA: any;
       let newQATabRenderer: any;