geckon01/decky-loader
1
0
Fork 0
mirror of https://github.com/SteamDeckHomebrew/decky-loader.git synced 2026-07-11 05:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

more updater fixes

Browse Source
This commit is contained in:
AAGaming
2022-07-15 12:57:51 -04:00
parent e07827cdb5
commit 9e032af5bc
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/injector.py
+2 -2
View File
@@ -33,7 +33,7 @@ class Tab:
return (await self.websocket.receive_json()) if receive else None return (await self.websocket.receive_json()) if receive else None
raise RuntimeError("Websocket not opened") raise RuntimeError("Websocket not opened")
async def evaluate_js(self, js, run_async=False, manage_socket=True): async def evaluate_js(self, js, run_async=False, manage_socket=True, get_result=True):
if manage_socket: if manage_socket:
await self.open_websocket() await self.open_websocket()
@@ -45,7 +45,7 @@ class Tab:
"userGesture": True, "userGesture": True,
"awaitPromise": run_async "awaitPromise": run_async
} }
}) }, get_result)
if manage_socket: if manage_socket:
await self.client.close() await self.client.close()
backend/updater.py
+2 -4
View File
@@ -59,7 +59,7 @@ class Updater:
return { return {
"current": self.localVer, "current": self.localVer,
"remote": self.remoteVer, "remote": self.remoteVer,
"updatable": self.remoteVer != None "updatable": self.localVer != None
} }
else: else:
return {"current": "unknown", "updatable": False} return {"current": "unknown", "updatable": False}
@@ -103,8 +103,7 @@ class Updater:
raw += len(c) raw += len(c)
new_progress = round((raw / total) * 100) new_progress = round((raw / total) * 100)
if progress != new_progress: if progress != new_progress:
if new_progress - progress>= 2: self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({progress})", False, False))
progress = new_progress progress = new_progress
with open(path.join(getcwd(), ".loader.version"), "w") as out: with open(path.join(getcwd(), ".loader.version"), "w") as out:
@@ -119,4 +118,3 @@ class Updater:
async def do_restart(self): async def do_restart(self):
call(["systemctl", "daemon-reload"]) call(["systemctl", "daemon-reload"])
call(["systemctl", "restart", "plugin_loader"]) call(["systemctl", "restart", "plugin_loader"])
exit(0)
frontend/src/components/settings/pages/general/Updater.tsx
+3 -4
View File
@@ -52,9 +52,9 @@ export default function UpdaterSettings() {
> >
{updateProgress == -1 ? ( {updateProgress == -1 ? (
<DialogButton <DialogButton
disabled={!versionInfo?.updatable || !versionInfo?.remote || checkingForUpdates} disabled={!versionInfo?.updatable || checkingForUpdates}
onClick={ onClick={
versionInfo?.remote?.tag_name == versionInfo?.current !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
? async () => { ? async () => {
setCheckingForUpdates(true); setCheckingForUpdates(true);
const res = (await callUpdaterMethod('check_for_updates')) as { result: VerInfo }; const res = (await callUpdaterMethod('check_for_updates')) as { result: VerInfo };
@@ -79,7 +79,7 @@ export default function UpdaterSettings() {
> >
{checkingForUpdates {checkingForUpdates
? 'Checking' ? 'Checking'
: versionInfo?.remote?.tag_name == versionInfo?.current : !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
? 'Check For Updates' ? 'Check For Updates'
: 'Install Update'} : 'Install Update'}
</DialogButton> </DialogButton>
@@ -88,7 +88,6 @@ export default function UpdaterSettings() {
layout="inline" layout="inline"
bottomSeparator={false} bottomSeparator={false}
nProgress={updateProgress} nProgress={updateProgress}
nTransitionSec={0.01}
indeterminate={reloading} indeterminate={reloading}
sOperationText={reloading ? 'Reloading' : 'Updating'} sOperationText={reloading ? 'Reloading' : 'Updating'}
/> />