diff options
Diffstat (limited to 'backend/decky_loader/plugin/sandboxed_plugin.py')
| -rw-r--r-- | backend/decky_loader/plugin/sandboxed_plugin.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backend/decky_loader/plugin/sandboxed_plugin.py b/backend/decky_loader/plugin/sandboxed_plugin.py index 32330a9a..93691a44 100644 --- a/backend/decky_loader/plugin/sandboxed_plugin.py +++ b/backend/decky_loader/plugin/sandboxed_plugin.py @@ -1,9 +1,9 @@ +import sys from os import path, environ from signal import SIG_IGN, SIGINT, SIGTERM, getsignal, signal from importlib.util import module_from_spec, spec_from_file_location from json import dumps, loads from logging import getLogger -from sys import exit, path as syspath, modules as sysmodules from traceback import format_exc from asyncio import (get_event_loop, new_event_loop, set_event_loop) @@ -13,7 +13,7 @@ from .messages import SocketResponseDict, SocketMessageType from ..localplatform.localsocket import LocalSocket from ..localplatform.localplatform import setgid, setuid, get_username, get_home_path from ..enums import UserType -from .. import helpers +from .. import helpers, settings, injector # pyright: ignore [reportUnusedImport] from typing import List, TypeVar, Any @@ -78,12 +78,12 @@ class SandboxedPlugin: environ["DECKY_PLUGIN_AUTHOR"] = self.author # append the plugin's `py_modules` to the recognized python paths - syspath.append(path.join(environ["DECKY_PLUGIN_DIR"], "py_modules")) + sys.path.append(path.join(environ["DECKY_PLUGIN_DIR"], "py_modules")) #TODO: FIX IN A LESS CURSED WAY - keys = [key for key in sysmodules if key.startswith("decky_loader.")] + keys = [key for key in sys.modules if key.startswith("decky_loader.")] for key in keys: - sysmodules[key.replace("decky_loader.", "")] = sysmodules[key] + sys.modules[key.replace("decky_loader.", "")] = sys.modules[key] from .imports import decky async def emit(event: str, *args: Any) -> None: @@ -95,9 +95,9 @@ class SandboxedPlugin: # copy the docstring over so we don't have to duplicate it emit.__doc__ = decky.emit.__doc__ decky.emit = emit - sysmodules["decky"] = decky + sys.modules["decky"] = decky # provided for compatibility - sysmodules["decky_plugin"] = decky + sys.modules["decky_plugin"] = decky spec = spec_from_file_location("_", self.file) assert spec is not None @@ -123,7 +123,7 @@ class SandboxedPlugin: get_event_loop().create_task(socket.setup_server()) except: self.log.error("Failed to start " + self.name + "!\n" + format_exc()) - exit(0) + sys.exit(0) try: get_event_loop().run_forever() except SystemExit: @@ -180,7 +180,7 @@ class SandboxedPlugin: loop = get_event_loop() loop.call_soon_threadsafe(loop.stop) - exit(0) + sys.exit(0) d: SocketResponseDict = {"type": SocketMessageType.RESPONSE, "res": None, "success": True, "id": data["id"]} try: |