geckon01/decky-loader
1
0
Fork 0
mirror of https://github.com/SteamDeckHomebrew/decky-loader.git synced 2026-06-17 08:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up remote binary logging, download process and old incorrect error

Browse Source
This commit is contained in:
TrainDoctor
2025-02-08 17:30:09 -08:00
parent 654957cb0c
commit 543ee3d19e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/decky_loader/browser.py
+9 -8
View File
@@ -96,7 +96,7 @@ class PluginBrowser:
binName = remoteBinary["name"] binName = remoteBinary["name"]
binURL = remoteBinary["url"] binURL = remoteBinary["url"]
binHash = remoteBinary["sha256hash"] binHash = remoteBinary["sha256hash"]
logger.debug(f"Attempting to download {binName} from {binURL}") logger.info(f"Attempting to download {binName} from {binURL}")
if not await download_remote_binary_to_path(binURL, binHash, path.join(pluginBinPath, binName)): if not await download_remote_binary_to_path(binURL, binHash, path.join(pluginBinPath, binName)):
rv = False rv = False
raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}") raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}")
@@ -105,7 +105,7 @@ class PluginBrowser:
chmod(pluginBasePath, 555) chmod(pluginBasePath, 555)
else: else:
rv = True rv = True
logger.debug(f"No Remote Binaries to Download") logger.info(f"No Remote Binaries to Download")
except Exception as e: except Exception as e:
rv = False rv = False
@@ -200,7 +200,7 @@ class PluginBrowser:
else: else:
logger.fatal(f"Could not fetch from URL. {await res.text()}") logger.fatal(f"Could not fetch from URL. {await res.text()}")
await self.loader.ws.emit("loader/plugin_download_info", 80, "Store.download_progress_info.increment_count") await self.loader.ws.emit("loader/plugin_download_info", 70, "Store.download_progress_info.increment_count")
storeUrl = "" storeUrl = ""
match self.settings.getSetting("store", 0): match self.settings.getSetting("store", 0):
case 0: storeUrl = "https://plugins.deckbrew.xyz/plugins" # default case 0: storeUrl = "https://plugins.deckbrew.xyz/plugins" # default
@@ -213,7 +213,7 @@ class PluginBrowser:
if res.status != 200: if res.status != 200:
logger.error(f"Server did not accept install count increment request. code: {res.status}") logger.error(f"Server did not accept install count increment request. code: {res.status}")
await self.loader.ws.emit("loader/plugin_download_info", 85, "Store.download_progress_info.parse_zip") await self.loader.ws.emit("loader/plugin_download_info", 75, "Store.download_progress_info.parse_zip")
if res_zip and version == "dev": if res_zip and version == "dev":
with ZipFile(res_zip) as plugin_zip: with ZipFile(res_zip) as plugin_zip:
plugin_json_list = [file for file in plugin_zip.namelist() if file.endswith("/plugin.json") and file.count("/") == 1] plugin_json_list = [file for file in plugin_zip.namelist() if file.endswith("/plugin.json") and file.count("/") == 1]
@@ -248,7 +248,7 @@ class PluginBrowser:
# If plugin is installed, uninstall it # If plugin is installed, uninstall it
if isInstalled: if isInstalled:
await self.loader.ws.emit("loader/plugin_download_info", 90, "Store.download_progress_info.uninstalling_previous") await self.loader.ws.emit("loader/plugin_download_info", 80, "Store.download_progress_info.uninstalling_previous")
try: try:
logger.debug("Uninstalling existing plugin...") logger.debug("Uninstalling existing plugin...")
await self.uninstall_plugin(name) await self.uninstall_plugin(name)
@@ -256,7 +256,7 @@ class PluginBrowser:
logger.error(f"Plugin {name} could not be uninstalled.") logger.error(f"Plugin {name} could not be uninstalled.")
await self.loader.ws.emit("loader/plugin_download_info", 95, "Store.download_progress_info.installing_plugin") await self.loader.ws.emit("loader/plugin_download_info", 90, "Store.download_progress_info.installing_plugin")
# Install the plugin # Install the plugin
logger.debug("Unzipping...") logger.debug("Unzipping...")
ret = self._unzip_to_plugin_dir(res_zip, name, hash) ret = self._unzip_to_plugin_dir(res_zip, name, hash)
@@ -264,7 +264,7 @@ class PluginBrowser:
plugin_folder = self.find_plugin_folder(name) plugin_folder = self.find_plugin_folder(name)
assert plugin_folder is not None assert plugin_folder is not None
plugin_dir = path.join(self.plugin_path, plugin_folder) plugin_dir = path.join(self.plugin_path, plugin_folder)
#TODO count again from 0% to 100% quickly for this one if it does anything await self.loader.ws.emit("loader/plugin_download_info", 95, "Store.download_progress_info.download_remote")
ret = await self._download_remote_binaries_for_plugin_with_name(plugin_dir) ret = await self._download_remote_binaries_for_plugin_with_name(plugin_dir)
if ret: if ret:
logger.info(f"Installed {name} (Version: {version})") logger.info(f"Installed {name} (Version: {version})")
@@ -279,7 +279,8 @@ class PluginBrowser:
logger.debug("Plugin %s was added to the pluginOrder setting", name) logger.debug("Plugin %s was added to the pluginOrder setting", name)
await self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder) await self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder)
else: else:
logger.fatal(f"Failed Downloading Remote Binaries") logger.error("Could not download remote binaries")
return
else: else:
logger.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})") logger.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
if self.loader.watcher: if self.loader.watcher:
backend/decky_loader/locales/en-US.json
+1
View File
@@ -223,6 +223,7 @@
"Store": { "Store": {
"download_progress_info": { "download_progress_info": {
"download_zip": "Downloading plugin", "download_zip": "Downloading plugin",
"download_remote": "Downloading any external binaries",
"increment_count": "Incrementing download count", "increment_count": "Incrementing download count",
"installing_plugin": "Installing plugin", "installing_plugin": "Installing plugin",
"open_zip": "Opening zip file", "open_zip": "Opening zip file",