qcanvas 1.0.6a2__tar.gz → 1.0.6a4__tar.gz

{qcanvas-1.0.6a2 → qcanvas-1.0.6a4}/PKG-INFO

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

{qcanvas-1.0.6a2 → qcanvas-1.0.6a4}/pyproject.toml

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

{qcanvas-1.0.6a2 → qcanvas-1.0.6a4}/qcanvas/util/paths.py

@@ -1,8 +1,10 @@
 import logging
+import os
 import platform
 import sys
 from pathlib import Path
 
+import cachetools
 import platformdirs
 from qtpy.QtCore import QDir, QSettings
 
@@ -11,6 +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 = os.environ.get("container", "") == "flatpak"
 
 
 def client_settings() -> QSettings:
@@ -23,13 +26,17 @@ 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 = 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())
+    print(root_path.absolute())
     return root_path