X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/5eb95c31a8eb6c13d27dcceb5510f2d9c6a04d71..d8c700bbb8b7bd992b9fe9b43de8a2f3d8e8587f:/tools/helpers/props.py diff --git a/tools/helpers/props.py b/tools/helpers/props.py index de3c3a8..18a10e6 100644 --- a/tools/helpers/props.py +++ b/tools/helpers/props.py @@ -3,7 +3,6 @@ from shutil import which import subprocess import logging -import os import tools.helpers.run from tools.interfaces import IPlatform @@ -21,34 +20,18 @@ def host_set(args, prop, value): tools.helpers.run.user(args, command) def get(args, prop): - if os.path.exists(tools.config.session_defaults["config_path"]): - session_cfg = tools.config.load_session() - if session_cfg["session"]["state"] == "RUNNING": - platformService = IPlatform.get_service(args) - if platformService: - return platformService.getprop(prop, "") - else: - logging.error("Failed to access IPlatform service") - else: - logging.error("WayDroid container is {}".format( - session_cfg["session"]["state"])) + platformService = IPlatform.get_service(args) + if platformService: + return platformService.getprop(prop, "") else: - logging.error("WayDroid session is stopped") + logging.error("Failed to access IPlatform service") def set(args, prop, value): - if os.path.exists(tools.config.session_defaults["config_path"]): - session_cfg = tools.config.load_session() - if session_cfg["session"]["state"] == "RUNNING": - platformService = IPlatform.get_service(args) - if platformService: - platformService.setprop(prop, value) - else: - logging.error("Failed to access IPlatform service") - else: - logging.error("WayDroid container is {}".format( - session_cfg["session"]["state"])) + platformService = IPlatform.get_service(args) + if platformService: + platformService.setprop(prop, value) else: - logging.error("WayDroid session is stopped") + logging.error("Failed to access IPlatform service") def file_get(args, file, prop): with open(file) as build_prop: @@ -58,5 +41,5 @@ def file_get(args, file, prop): continue k,v = line.partition("=")[::2] if k == prop: - return v; + return v return ""