diff options
| -rw-r--r-- | backend/helpers.py | 6 | ||||
| -rw-r--r-- | backend/loader.py | 9 | ||||
| -rw-r--r-- | backend/updater.py | 22 |
3 files changed, 13 insertions, 24 deletions
diff --git a/backend/helpers.py b/backend/helpers.py index 35681f68..af07b759 100644 --- a/backend/helpers.py +++ b/backend/helpers.py @@ -116,10 +116,10 @@ def mkdir_as_user(path): # Fetches the version of loader def get_loader_version() -> str: try: - with open(os.path.join(os.path.dirname(sys.argv[0]), ".loader.version"), "r", encoding="utf-8") as version_file: - return version_file.readline().replace("\n", "") + with open(os.path.join(os.getcwd(), ".loader.version"), "r", encoding="utf-8") as version_file: + return version_file.readline().strip() except: - return "" + return "unknown" # returns the appropriate system python paths def get_system_pythonpaths() -> list[str]: diff --git a/backend/loader.py b/backend/loader.py index 48a66a8d..be216a15 100644 --- a/backend/loader.py +++ b/backend/loader.py @@ -6,14 +6,9 @@ from pathlib import Path from traceback import print_exc from aiohttp import web -from genericpath import exists +from os.path import exists from watchdog.events import RegexMatchingEventHandler -from watchdog.utils import UnsupportedLibc - -try: - from watchdog.observers.inotify import InotifyObserver as Observer -except UnsupportedLibc: - from watchdog.observers.fsevents import FSEventsObserver as Observer +from watchdog.observers import Observer from injector import get_tab, get_gamepadui_tab from plugin import PluginWrapper diff --git a/backend/updater.py b/backend/updater.py index 14fd2070..020e8db4 100644 --- a/backend/updater.py +++ b/backend/updater.py @@ -30,10 +30,7 @@ class Updater: } self.remoteVer = None self.allRemoteVers = None - try: - self.localVer = helpers.get_loader_version() - except: - self.localVer = False + self.localVer = helpers.get_loader_version() try: self.currentBranch = self.get_branch(self.context.settings) @@ -68,7 +65,7 @@ class Updater: logger.debug("current branch: %i" % ver) if ver == -1: logger.info("Current branch is not set, determining branch from version...") - if self.localVer.startswith("v") and self.localVer.find("-pre"): + if self.localVer.startswith("v") and "-pre" in self.localVer: logger.info("Current version determined to be pre-release") return 1 else: @@ -94,15 +91,12 @@ class Updater: return str(url) async def get_version(self): - if self.localVer: - return { - "current": self.localVer, - "remote": self.remoteVer, - "all": self.allRemoteVers, - "updatable": self.localVer != None - } - else: - return {"current": "unknown", "remote": self.remoteVer, "all": self.allRemoteVers, "updatable": False} + return { + "current": self.localVer, + "remote": self.remoteVer, + "all": self.allRemoteVers, + "updatable": self.localVer != "unknown" + } async def check_for_updates(self): logger.debug("checking for updates") |