From 8d2b252e6d5fde081255f8bdc02866cc6965b3fc Mon Sep 17 00:00:00 2001 From: Mitja Skuver Date: Sun, 13 Oct 2024 19:20:08 +0000 Subject: [PATCH] Fixed plugin manual zip installation getting stuck indefinitely (#706) --- backend/decky_loader/browser.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/decky_loader/browser.py b/backend/decky_loader/browser.py index af23ed0c..f55b269f 100644 --- a/backend/decky_loader/browser.py +++ b/backend/decky_loader/browser.py @@ -213,7 +213,19 @@ async def _install(self, artifact: str, name: str, version: str, hash: str): return else: - name = sub(r"/.+$", "", plugin_json_list[0]) + plugin_json_file = plugin_json_list[0] + name = sub(r"/.+$", "", plugin_json_file) + try: + with plugin_zip.open(plugin_json_file) as f: + plugin_json_data = json.loads(f.read().decode('utf-8')) + plugin_name_from_plugin_json = plugin_json_data.get('name') + if plugin_name_from_plugin_json and plugin_name_from_plugin_json.strip(): + logger.info(f"Extracted plugin name from {plugin_json_file}: {plugin_name_from_plugin_json}") + name = plugin_name_from_plugin_json + else: + logger.warning(f"Nonexistent or invalid 'name' key value in {plugin_json_file}. Falling back to extracting from path.") + except Exception as e: + logger.error(f"Failed to read or parse {plugin_json_file}: {str(e)}. Falling back to extracting from path.") try: pluginFolderPath = self.find_plugin_folder(name)