Merge pull request #263 from xXJSONDeruloXx/v2-now-playing

flatpak correctness, ui alignment, tests

2 files changed, 34 insertions, 2 deletions

diff --git a/py_modules/lsfg_vk/flatpak_profile_service.py b/py_modules/lsfg_vk/flatpak_profile_service.py
index ddec116..9d2d104 100644
--- a/py_modules/lsfg_vk/flatpak_profile_service.py
+++ b/py_modules/lsfg_vk/flatpak_profile_service.py
@@ -202,7 +202,7 @@ class FlatpakProfileService:
             result = self.configuration_service.update_flatpak_config(app_id, config)
             if not result.get("success"):
                 raise RuntimeError(result.get("error") or "Could not update Flatpak profile")
-            return self.get_app(app_id)
+            return result
         except Exception as error:
             return {
                 "success": False,
@@ -374,8 +374,10 @@ class FlatpakProfileService:
                     "app_id": fields[0],
                     "active": active,
                     "pid": fields[2].strip() if len(fields) > 2 else "",
+                    "start_time": self.flatpak_service._process_start_time(
+                        fields[2].strip() if len(fields) > 2 else ""
+                    ),
                 })
-            running.sort(key=lambda item: (not item["active"], item["app_id"]))
             return {"success": True, "message": "", "error": None, "apps": running}
         except Exception as error:
             return {"success": False, "message": "", "error": str(error), "apps": []}
diff --git a/py_modules/lsfg_vk/flatpak_service.py b/py_modules/lsfg_vk/flatpak_service.py
index 4f04382..f2ed90c 100644
--- a/py_modules/lsfg_vk/flatpak_service.py
+++ b/py_modules/lsfg_vk/flatpak_service.py
@@ -44,6 +44,13 @@ class FlatpakService(BaseService):
         env = os.environ.copy()
         env.pop("LD_LIBRARY_PATH", None)
         env["HOME"] = str(self.user_home)
+        try:
+            user_id = self.user_home.stat().st_uid
+        except OSError:
+            user_id = None
+        if user_id is not None:
+            env["XDG_RUNTIME_DIR"] = f"/run/user/{user_id}"
+            env["DBUS_SESSION_BUS_ADDRESS"] = f"unix:path=/run/user/{user_id}/bus"
         path = [entry for entry in env.get("PATH", "").split(":") if entry]
         for entry in ("/usr/bin", "/usr/local/bin", "/bin"):
             if entry not in path:
@@ -196,6 +203,29 @@ class FlatpakService(BaseService):
     def _sha256(content: bytes) -> str:
         return hashlib.sha256(content).hexdigest()
 
+    @staticmethod
+    def _parse_process_start_time(stat_content: str) -> Optional[int]:
+        closing_command = stat_content.rfind(")")
+        if closing_command < 0:
+            return None
+        fields = stat_content[closing_command + 2:].split()
+        if len(fields) <= 19:
+            return None
+        try:
+            return int(fields[19])
+        except (TypeError, ValueError):
+            return None
+
+    @classmethod
+    def _process_start_time(cls, pid: str) -> Optional[int]:
+        if not isinstance(pid, str) or re.fullmatch(r"[0-9]+", pid) is None:
+            return None
+        try:
+            stat_content = (Path("/proc") / pid / "stat").read_text(encoding="utf-8")
+        except OSError:
+            return None
+        return cls._parse_process_start_time(stat_content)
+
     def _snapshot_override(self, app_id: str) -> tuple[bool, bytes]:
         path = self._override_path(app_id)
         if path.is_symlink():