fix: backport fixes from feat/shortcuts

This commit is contained in:
aclist committed 2026-07-12 10:15:58 +09:00
1 parent b50d061e1f
commit a2a39e9927
1 file changed
+16 -3
+16 -3
View File
@@ -15,6 +15,7 @@ from dzgui.const.constants import (
APPID_DAYZ, APPID_DAYZ,
APPID_DAYZ_EXP, APPID_DAYZ_EXP,
APP_NAME, APP_NAME,
DAYZ_BINARY,
DEBIAN_STEAM_PATH, DEBIAN_STEAM_PATH,
DEFAULT_STEAM_PATH, DEFAULT_STEAM_PATH,
FLATPAK_STEAM_PATH, FLATPAK_STEAM_PATH,
@@ -309,7 +310,8 @@ def get_running_app() -> int | None:
PROC_NAME = "steam" PROC_NAME = "steam"
SUBPROC_NAME = "reaper" SUBPROC_NAME = "reaper"
FLAG = "AppId" FLAG = "AppId"
# NOTE: may cause conflicts if multiple apps are running
try:
for proc in psutil.process_iter(): for proc in psutil.process_iter():
if proc.name() == PROC_NAME: if proc.name() == PROC_NAME:
subprocs = proc.children() subprocs = proc.children()
@@ -324,6 +326,9 @@ def get_running_app() -> int | None:
return int(next(appid).split("=")[1]) return int(next(appid).split("=")[1])
except StopIteration: except StopIteration:
return None return None
except Exception as e:
logger.debug(e)
return None
return None return None
@@ -368,8 +373,16 @@ def get_client_allows_downloads(path: Path) -> bool:
def is_dayz_running() -> bool: def is_dayz_running() -> bool:
appid = get_running_app() """Subprocesses spawned from Steam will not show up in regular process tree"""
return appid in (APPID_DAYZ, APPID_DAYZ_EXP) procs = []
substring = DAYZ_BINARY
for proc in psutil.process_iter():
try:
procs.append(proc.cmdline())
except Exception as e:
logger.warning(e)
continue
return any(substring in item for sublist in procs for item in sublist)
def get_app_path(folders_path: Path, appid: int) -> Path: def get_app_path(folders_path: Path, appid: int) -> Path: