summaryrefslogtreecommitdiff
path: root/backend/browser.py
diff options
context:
space:
mode:
authorsuchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>2023-03-22 01:37:23 +0100
committerGitHub <noreply@github.com>2023-03-21 17:37:23 -0700
commitfd325ef1cc1d3e78b5e7686819e05606cc79d963 (patch)
tree1372e0efa0ca47b0045b4d29c40bb3a8caeadfc1 /backend/browser.py
parentfaf46ba53354b6dcfbfae25e605bf567acd19376 (diff)
downloaddecky-loader-fd325ef1cc1d3e78b5e7686819e05606cc79d963.tar.gz
decky-loader-fd325ef1cc1d3e78b5e7686819e05606cc79d963.zip
Add cross-platform support to decky (#387)
* Import generic watchdog observer over platform specific import * Use os.path rather than genericpath * Split off socket management in plugin.py * Don't specify multiprocessing start type Default on linux is already fork * Move all platform-specific functions to seperate files TODO: make plugin.py platform agnostic * fix import * add backwards compat to helpers.py * add backwards compatibility to helpers.py harder * Testing autobuild for win * Testing autobuild for win, try 2 * Testing autobuild for win, try 3 * Testing autobuild for win, try 4 * Create the plugins folder before attempting to use it * Implement win get_username() * Create win install script * Fix branch guess from version * Create .loader.version in install script * Add .cmd shim to facilitate auto-restarts * Properly fix branch guess from version * Fix updater on windows * Try 2 of fixing updates for windows * Test * pain * Update install script * Powershell doesn't believe in utf8 * Powershell good * add ON_LINUX variable to localplatform * Fix more merge issues * test * Move custom imports to main.py * Move custom imports to after __main__ check Due to windows' default behaviour being spawn, it will spawn a new process and thus import into sys.path multiple times * Log errors in get_system_pythonpaths() and get_loader_version() + split get_system_pythonpaths() on newline * Remove whitespace in result of get_system_pythonpaths() * use python3 on linux and python on windows in get_system_pythonpaths() * Remove fork-specific urls * Fix MIME types not working on Windows
Diffstat (limited to 'backend/browser.py')
-rw-r--r--backend/browser.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/backend/browser.py b/backend/browser.py
index c15e1ada..97fa3f11 100644
--- a/backend/browser.py
+++ b/backend/browser.py
@@ -12,12 +12,12 @@ from io import BytesIO
from logging import getLogger
from os import R_OK, W_OK, path, rename, listdir, access, mkdir
from shutil import rmtree
-from subprocess import call
from time import time
from zipfile import ZipFile
+from localplatform import chown, chmod
# Local modules
-from helpers import get_ssl_context, get_user, get_user_group, download_remote_binary_to_path
+from helpers import get_ssl_context, download_remote_binary_to_path
from injector import get_gamepadui_tab
logger = getLogger("Browser")
@@ -43,10 +43,9 @@ class PluginBrowser:
zip_file = ZipFile(zip)
zip_file.extractall(self.plugin_path)
plugin_dir = path.join(self.plugin_path, self.find_plugin_folder(name))
- code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), plugin_dir])
- code_chmod = call(["chmod", "-R", "555", plugin_dir])
- if code_chown != 0 or code_chmod != 0:
- logger.error(f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod: {code_chmod})")
+
+ if not chown(plugin_dir) or not chmod(plugin_dir, 555):
+ logger.error(f"chown/chmod exited with a non-zero exit code")
return False
return True
@@ -61,14 +60,14 @@ class PluginBrowser:
packageJson = json.load(f)
if "remote_binary" in packageJson and len(packageJson["remote_binary"]) > 0:
# create bin directory if needed.
- rc=call(["chmod", "-R", "777", pluginBasePath])
+ chmod(pluginBasePath, 777)
if access(pluginBasePath, W_OK):
if not path.exists(pluginBinPath):
mkdir(pluginBinPath)
if not access(pluginBinPath, W_OK):
- rc=call(["chmod", "-R", "777", pluginBinPath])
+ chmod(pluginBinPath, 777)
rv = True
for remoteBinary in packageJson["remote_binary"]:
@@ -80,8 +79,8 @@ class PluginBrowser:
rv = False
raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}")
- code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), self.plugin_path])
- rc=call(["chmod", "-R", "555", pluginBasePath])
+ chown(self.plugin_path)
+ chmod(pluginBasePath, 555)
else:
rv = True
logger.debug(f"No Remote Binaries to Download")