qcanvas 1.0.6a3__tar.gz → 1.0.6a5__tar.gz

{qcanvas-1.0.6a3 → qcanvas-1.0.6a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.6a3
+Version: 1.0.6a5
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org

{qcanvas-1.0.6a3 → qcanvas-1.0.6a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.6a3"
+version = "1.0.6a5"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"

{qcanvas-1.0.6a3 → qcanvas-1.0.6a5}/qcanvas/util/paths.py

@@ -4,6 +4,7 @@ import platform
 import sys
 from pathlib import Path
 
+import cachetools
 import platformdirs
 from qtpy.QtCore import QDir, QSettings
 
@@ -12,11 +13,7 @@ _logger = logging.getLogger(__name__)
 _is_running_on_windows = platform.system() == "Windows"
 _is_running_on_linux = platform.system() == "Linux"
 _is_running_as_pyinstaller = getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS")
-_is_running_as_flatpak = getattr(sys, "container", False)
-
-print(_is_running_as_flatpak)
-print(sys)
-print(os.environ.items())
+_is_running_as_flatpak = os.environ.get("container", "") == "flatpak"
 
 
 def client_settings() -> QSettings:
@@ -29,10 +26,13 @@ def client_settings() -> QSettings:
         return QSettings("QCanvasTeam", "QCanvas")
 
 
+@cachetools.cached(cachetools.LRUCache(maxsize=1))
 def root() -> Path:
     root_path = Path()
 
-    if _is_running_as_pyinstaller:
+    if _is_running_as_flatpak:
+        root_path = Path(os.environ["XDG_DATA_HOME"])
+    elif _is_running_as_pyinstaller:
         root_path = platformdirs.user_data_path("QCanvasReborn", "QCanvasTeam")
 
     _logger.debug("Root path %s", root_path.absolute())