Skip to content

Commit

Permalink
Get plugin name for development ZIP during installation (#578)
Browse files Browse the repository at this point in the history
* fix: get plugin name for dev builds from ZIP (#527)

Signed-off-by: eXhumer <exhumer1@protonmail.com>
  • Loading branch information
eXhumer authored Feb 15, 2024
1 parent 9503d5c commit 0dce3a8
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions backend/src/browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from io import BytesIO
from logging import getLogger
from os import R_OK, W_OK, path, listdir, access, mkdir
from re import sub
from shutil import rmtree
from time import time
from zipfile import ZipFile
Expand Down Expand Up @@ -162,12 +163,6 @@ async def _install(self, artifact: str, name: str, version: str, hash: str):
current_plugin_order = self.settings.getSetting("pluginOrder")[:]
if self.loader.watcher:
self.loader.watcher.disabled = True
try:
pluginFolderPath = self.find_plugin_folder(name)
if pluginFolderPath:
isInstalled = True
except:
logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")

# Check if the file is a local file or a URL
if artifact.startswith("file://"):
Expand Down Expand Up @@ -198,6 +193,28 @@ async def _install(self, artifact: str, name: str, version: str, hash: str):
if res.status != 200:
logger.error(f"Server did not accept install count increment request. code: {res.status}")

if res_zip and version == "dev":
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]

if len(plugin_json_list) == 0:
logger.fatal("No plugin.json found in plugin ZIP")
return

elif len(plugin_json_list) > 1:
logger.fatal("Multiple plugin.json found in plugin ZIP")
return

else:
name = sub(r"/.+$", "", plugin_json_list[0])

try:
pluginFolderPath = self.find_plugin_folder(name)
if pluginFolderPath:
isInstalled = True
except:
logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")

# Check to make sure we got the file
if res_zip is None:
logger.fatal(f"Could not fetch {artifact}")
Expand Down

0 comments on commit 0dce3a8

Please sign in to comment.