michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-06-20 16:40:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: plugin init cleanups

Browse Source
This commit is contained in:
Koushik Dutta
2024-03-11 12:56:21 -07:00
parent 3fb519e3b2
commit 441361e1ec
9 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
server/python/plugin_remote.py
View File

@@ -373,15 +373,15 @@ class PluginRemote:
asyncio.run_coroutine_threadsafe(self.print_async(
nativeId, *values, sep=sep, end=end, flush=flush), self.loop)
async def loadZip(self, packageJson, zipData, options: dict = None):
async def loadZip(self, packageJson, zipFile: str, options: dict = None):
try:
return await self.loadZipWrapped(packageJson, zipData, options)
return await self.loadZipWrapped(packageJson, zipFile, options)
except:
print('plugin start/fork failed')
traceback.print_exc()
raise
async def loadZipWrapped(self, packageJson, zipData, options: dict = None):
async def loadZipWrapped(self, packageJson, zipFile: str, options: dict = None):
sdk = ScryptedStatic()
clusterId = options['clusterId']
@@ -510,26 +510,23 @@ class PluginRemote:
forkMain = options and options.get('fork')
# python debugger needs a predictable path for the plugin.zip,
# as the vscode python extension doesn't seem to have a way
# to read the package.json to configure the python remoteRoot.
debug = options and options.get('debug', None)
if debug:
scrypted_volume = os.environ.get('SCRYPTED_VOLUME')
zipPath = os.path.join(scrypted_volume, 'plugin.zip')
shutil.copyfile(zipFile, zipPath)
else:
zipPath = zipFile
zip = zipfile.ZipFile(zipPath)
if not forkMain:
multiprocessing.set_start_method('spawn')
zipPath: str
if isinstance(zipData, str):
zipPath = (options and options.get(
'filename', None)) or zipData
if zipPath != zipData:
shutil.copyfile(zipData, zipPath)
else:
zipPath = options['filename']
f = open(zipPath, 'wb')
f.write(zipData)
f.close()
zipData = None
zip = zipfile.ZipFile(zipPath)
plugin_volume = os.environ.get('SCRYPTED_PLUGIN_VOLUME')
# it's possible to run 32bit docker on aarch64, which cause pip requirements
@@ -596,8 +593,6 @@ class PluginRemote:
sys.path.insert(0, zipPath)
sys.path.insert(0, pip_target)
else:
zip = zipfile.ZipFile(options['filename'])
self.systemManager = SystemManager(self.api, self.systemState)
self.deviceManager = DeviceManager(self.nativeIds, self.systemManager)
@@ -664,8 +659,8 @@ class PluginRemote:
await remote.setNativeId(nativeId, ds.id, ds.storage)
forkOptions = (options or {}).copy()
forkOptions['fork'] = True
forkOptions['filename'] = zipPath
return await remote.loadZip(packageJson, zipData, forkOptions)
forkOptions['debug'] = debug
return await remote.loadZip(packageJson, zipFile, forkOptions)
pluginFork.result = asyncio.create_task(getFork())
return pluginFork