use fstring

backend/browser.py

@@ -45,20 +45,24 @@ class PluginBrowser:
 
     def find_plugin_folder(self, name):
         for folder in listdir(self.plugin_path):
-            with open(path.join(self.plugin_path, folder, 'plugin.json'), 'r') as f:
-                plugin = json.load(f)
+            try:
+                with open(path.join(self.plugin_path, folder, 'plugin.json'), 'r') as f:
+                    plugin = json.load(f)
 
-            if plugin['name'] == name:
-                return path.join(self.plugin_path, folder)
+                if plugin['name'] == name:
+                    return path.join(self.plugin_path, folder)
+            except:
+                self.log.debug(f"skipping {folder}")
 
     async def uninstall_plugin(self, name):
         tab = await get_tab("SP")
-        await tab.open_websocket()
 
         try:
             if type(name) != str:
                 data = await name.post()
-                name = data.get("name")
+                name = data.get("name", "undefined")
+            self.log.info("uninstalling " + name)
+            self.log.info(" at dir " + self.find_plugin_folder(name))
             await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')")
             rmtree(self.find_plugin_folder(name))
         except FileNotFoundError:

backend/injector.py

@@ -33,7 +33,7 @@ class Tab:
             return (await self.websocket.receive_json()) if receive else None
         raise RuntimeError("Websocket not opened")
 
-    async def evaluate_js(self, js, run_async=False, manage_socket=True):
+    async def evaluate_js(self, js, run_async=False, manage_socket=True, get_result=True):
         if manage_socket:
             await self.open_websocket()
 
@@ -45,7 +45,7 @@ class Tab:
                 "userGesture": True,
                 "awaitPromise": run_async
             }
-        })
+        }, get_result)
 
         if manage_socket:
             await self.client.close()

backend/updater.py

@@ -59,7 +59,7 @@ class Updater:
             return {
                 "current": self.localVer,
                 "remote": self.remoteVer,
-                "updatable": self.remoteVer != None
+                "updatable": self.localVer != None
             }
         else:
             return {"current": "unknown", "updatable": False}
@@ -91,8 +91,10 @@ class Updater:
         async with ClientSession() as web:
             async with web.request("GET", download_url, ssl=helpers.get_ssl_context(), allow_redirects=True) as res:
                 total = int(res.headers.get('content-length', 0))
-
-                remove(path.join(getcwd(), "PluginLoader"))
+                try:
+                    remove(path.join(getcwd(), "PluginLoader"))
+                except:
+                    pass
                 with open(path.join(getcwd(), "PluginLoader"), "wb") as out:
                     progress = 0
                     raw = 0
@@ -101,8 +103,7 @@ class Updater:
                         raw += len(c)
                         new_progress = round((raw / total) * 100)
                         if progress != new_progress:
-                            if new_progress - progress>= 2:
-                                self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({progress})", False, False))
+                            self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
                             progress = new_progress
 
                 with open(path.join(getcwd(), ".loader.version"), "w") as out:
@@ -117,4 +118,3 @@ class Updater:
     async def do_restart(self):
         call(["systemctl", "daemon-reload"])
         call(["systemctl", "restart", "plugin_loader"])
-        exit(0)

frontend/src/components/settings/pages/general/Updater.tsx

@@ -52,9 +52,9 @@ export default function UpdaterSettings() {
     >
       {updateProgress == -1 ? (
         <DialogButton
-          disabled={!versionInfo?.updatable || !versionInfo?.remote || checkingForUpdates}
+          disabled={!versionInfo?.updatable || checkingForUpdates}
           onClick={
-            versionInfo?.remote?.tag_name == versionInfo?.current
+            !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
               ? async () => {
                   setCheckingForUpdates(true);
                   const res = (await callUpdaterMethod('check_for_updates')) as { result: VerInfo };
@@ -79,7 +79,7 @@ export default function UpdaterSettings() {
         >
           {checkingForUpdates
             ? 'Checking'
-            : versionInfo?.remote?.tag_name == versionInfo?.current
+            : !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
             ? 'Check For Updates'
             : 'Install Update'}
         </DialogButton>
@@ -88,7 +88,6 @@ export default function UpdaterSettings() {
           layout="inline"
           bottomSeparator={false}
           nProgress={updateProgress}
-          nTransitionSec={0.01}
           indeterminate={reloading}
           sOperationText={reloading ? 'Reloading' : 'Updating'}
         />

frontend/src/components/settings/pages/plugin_list/index.tsx

@@ -22,7 +22,7 @@ export default function PluginList() {
           <div className={staticClasses.Title} style={{ marginLeft: 'auto', boxShadow: 'none' }}>
             <DialogButton
               style={{ height: '40px', width: '40px', padding: '10px 12px' }}
-              onClick={() => window.DeckyPluginLoader.uninstall_plugin(name)}
+              onClick={() => window.DeckyPluginLoader.uninstallPlugin(name)}
             >
               <FaTrash />
             </DialogButton>

frontend/src/components/store/Store.tsx

@@ -1,4 +1,4 @@
-import { SteamSpinner } from 'decky-frontend-lib';
+import { ModalRoot, SteamSpinner, showModal, staticClasses } from 'decky-frontend-lib';
 import { FC, useEffect, useState } from 'react';
 
 import PluginCard from './PluginCard';
@@ -38,16 +38,32 @@ export async function installFromURL(url: string) {
   });
 }
 
-export async function requestLegacyPluginInstall(plugin: LegacyStorePlugin, selectedVer: string) {
-  const formData = new FormData();
-  formData.append('name', plugin.artifact);
-  formData.append('artifact', `https://github.com/${plugin.artifact}/archive/refs/tags/${selectedVer}.zip`);
-  formData.append('version', selectedVer);
-  formData.append('hash', plugin.versions[selectedVer]);
-  await fetch('http://localhost:1337/browser/install_plugin', {
-    method: 'POST',
-    body: formData,
-  });
+export function requestLegacyPluginInstall(plugin: LegacyStorePlugin, selectedVer: string) {
+  showModal(
+    <ModalRoot
+      onOK={() => {
+        const formData = new FormData();
+        formData.append('name', plugin.artifact);
+        formData.append('artifact', `https://github.com/${plugin.artifact}/archive/refs/tags/${selectedVer}.zip`);
+        formData.append('version', selectedVer);
+        formData.append('hash', plugin.versions[selectedVer]);
+        fetch('http://localhost:1337/browser/install_plugin', {
+          method: 'POST',
+          body: formData,
+        });
+      }}
+      onCancel={() => {
+        // do nothing
+      }}
+    >
+      <div className={staticClasses.Title} style={{ flexDirection: 'column', boxShadow: 'unset' }}>
+        Using legacy plugins
+      </div>
+      You are currently installing a <b>legacy</b> plugin. Legacy plugins are no longer supported and may have issues.
+      Legacy plugins do not support gamepad input. To interact with a legacy plugin, you will need to use the
+      touchscreen.
+    </ModalRoot>,
+  );
 }
 
 export async function requestPluginInstall(plugin: StorePlugin, selectedVer: StorePluginVersion) {

frontend/src/plugin-loader.tsx

@@ -75,7 +75,7 @@ class PluginLoader extends Logger {
     );
   }
 
-  public uninstall_plugin(name: string) {
+  public uninstallPlugin(name: string) {
     showModal(
       <ModalRoot
         onOK={async () => {