summaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorAAGaming <aagaming@riseup.net>2026-11-21 21:16:14 -0500
committerAAGaming <aagaming@riseup.net>2026-11-21 21:16:14 -0500
commitfc0355f55d8d36826466fc304d6ecb254d4b7ca1 (patch)
tree6497c5c260e6f032ab468dce0f361f64d003af12 /backend
parent02db20f846857374b9b5f1e7dbd475befdf47b71 (diff)
parentf8682eb26fb23c9bed3c4a509d2b90eb582805f3 (diff)
downloaddecky-loader-fc0355f55d8d36826466fc304d6ecb254d4b7ca1.tar.gz
decky-loader-fc0355f55d8d36826466fc304d6ecb254d4b7ca1.zip
Merge remote-tracking branch 'origin/v4-dev' into aa/esmodule-steam
Diffstat (limited to 'backend')
-rw-r--r--backend/decky_loader/injector.py4
-rw-r--r--backend/decky_loader/updater.py2
-rw-r--r--backend/decky_loader/utilities.py2
-rw-r--r--backend/pyinstaller.spec3
4 files changed, 8 insertions, 3 deletions
diff --git a/backend/decky_loader/injector.py b/backend/decky_loader/injector.py
index 05205fae..305157dc 100644
--- a/backend/decky_loader/injector.py
+++ b/backend/decky_loader/injector.py
@@ -190,7 +190,7 @@ class Tab:
# Page finishes loading when breakpoint hits
for _ in range(20):
- # this works around 1/5 of the time, so just send it 8 times.
+ # this works around 1/5 of the time, so just send it 20 times.
# the js accounts for being injected multiple times allowing only one instance to run at a time anyway
await self._send_devtools_cmd({
"method": "Runtime.evaluate",
@@ -508,4 +508,4 @@ async def close_old_tabs():
if not t.title or (t.title not in SHARED_CTX_NAMES and any(url in t.url for url in CLOSEABLE_URLS) and not any(url in t.url for url in DO_NOT_CLOSE_URLS)):
logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
await t.close()
- await sleep(0.5)
+ # await sleep(0.5)
diff --git a/backend/decky_loader/updater.py b/backend/decky_loader/updater.py
index d018b4fe..cefa6b11 100644
--- a/backend/decky_loader/updater.py
+++ b/backend/decky_loader/updater.py
@@ -44,6 +44,7 @@ class Updater:
self.isSupported: bool = ON_LINUX
self.repo = getenv('DECKY_REPO', 'SteamDeckHomebrew/decky-loader')
self.git_branch = getenv('DECKY_BRANCH', 'dirty')
+ self.git_pr = getenv('DECKY_PR', None)
try:
self.currentBranch = self.get_branch(self.context.settings)
@@ -98,6 +99,7 @@ class Updater:
"current": self.localVer,
"repo": self.repo,
"gitBranch": self.git_branch,
+ "gitPR": self.git_pr,
"remote": self.remoteVer,
"all": self.allRemoteVers,
"updatable": self.localVer != "unknown" and self.localVer != "dev",
diff --git a/backend/decky_loader/utilities.py b/backend/decky_loader/utilities.py
index 99a1b019..7f1ac09d 100644
--- a/backend/decky_loader/utilities.py
+++ b/backend/decky_loader/utilities.py
@@ -442,7 +442,7 @@ class Utilities:
enumerable: true,
configurable: true,
get: function() {
- return (GamepadNavTree?.m_context?.m_controller || FocusNavController)?.m_ActiveContext?.ActiveWindow || window;
+ return (window?.GamepadNavTree?.m_context?.m_controller || window?.FocusNavController)?.m_ActiveContext?.ActiveWindow || window;
}
});
""" + await res.text() + "\n}"
diff --git a/backend/pyinstaller.spec b/backend/pyinstaller.spec
index 3ef888f5..ab27d1ea 100644
--- a/backend/pyinstaller.spec
+++ b/backend/pyinstaller.spec
@@ -7,6 +7,7 @@ noconsole_str = os.getenv('DECKY_NOCONSOLE', '0')
noconsole = bool(noconsole_str)
repo = os.getenv('DECKY_REPO', 'SteamDeckHomebrew/decky-loader')
branch = os.getenv('DECKY_BRANCH', 'main')
+pr = os.getenv('DECKY_PR', None)
with open('build_config.py', 'w') as f:
f.write(f"""
import os
@@ -15,6 +16,8 @@ os.environ['DECKY_PACKAGED_BUILD'] = '1'
# Build info
os.environ['DECKY_REPO'] = {repr(repo)}
os.environ['DECKY_BRANCH'] = {repr(branch)}
+if {repr(pr)} is not None:
+ os.environ['DECKY_PR'] = {repr(pr)}
# Windows-specific
os.environ['DECKY_NOCONSOLE'] = {repr(noconsole_str)}