qcanvas 1.0.12.dev1__tar.gz → 1.0.12.dev2__tar.gz

{qcanvas-1.0.12.dev1 → qcanvas-1.0.12.dev2}/PKG-INFO

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

{qcanvas-1.0.12.dev1 → qcanvas-1.0.12.dev2}/pyproject.toml

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

{qcanvas-1.0.12.dev1 → qcanvas-1.0.12.dev2}/qcanvas/util/paths.py

@@ -10,6 +10,7 @@ from qtpy.QtCore import QSettings
 
 _logger = logging.getLogger(__name__)
 
+_is_running_portable = Path(".portable").exists()
 _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")
@@ -17,7 +18,9 @@ _is_running_as_flatpak = os.environ.get("container", "") == "flatpak"
 
 
 def client_settings() -> QSettings:
-    if _is_running_as_pyinstaller and _is_running_on_windows:
+    if _is_running_portable:
+        return QSettings("QCanvas.ini", QSettings.Format.IniFormat)
+    elif _is_running_as_pyinstaller and _is_running_on_windows:
         return QSettings(
             str(platformdirs.user_documents_path() / "QCanvasTeam" / "QCanvas.ini"),
             QSettings.Format.IniFormat,
@@ -30,10 +33,11 @@ def client_settings() -> QSettings:
 def root() -> Path:
     root_path = Path()
 
-    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")
+    if not _is_running_portable:
+        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")
 
     print("Root path", root_path.absolute())
     _logger.debug("Root path %s", root_path.absolute())