qcanvas 2.0.3__tar.gz → 2.0.5__tar.gz

{qcanvas-2.0.3 → qcanvas-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qcanvas
-Version: 2.0.3
+Version: 2.0.5
 Summary: View courses from Canvas LMS
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
@@ -8,10 +8,10 @@ Requires-Python: >=3.12,<3.13
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiofile (>=3.9.0,<4.0.0)
-Requires-Dist: aiosqlite (>=0.20.0,<0.21.0)
+Requires-Dist: aiosqlite (>=0.21.0,<0.22.0)
 Requires-Dist: asynctaskpool (>=0.2.1,<0.3.0)
 Requires-Dist: cachetools (>=5.5.0,<6.0.0)
-Requires-Dist: libqcanvas (>=0.5.4,<0.6.0)
+Requires-Dist: libqcanvas (>=0.5.5,<0.6.0)
 Requires-Dist: platformdirs (>=4.2.2,<5.0.0)
 Requires-Dist: pyqtdarktheme-fork (>=2.3.2,<3.0.0)
 Requires-Dist: qasync (>=0.27.1,<0.28.0)
@@ -35,8 +35,7 @@ https://github.com/QCanvas/QCanvasApp
 
 You can download a **windows** version from [releases](https://github.com/QCanvas/QCanvasApp/releases)
 
-> [!WARNING] 
-> The appimage version is currently broken and may be dropped in the future.
+An appimage version is also available from releases but is not recommended.
 
 # Development/Run from source
 
@@ -63,7 +62,7 @@ poetry run python -m qcanvas
 ## Build custom AppImage
 
 > [!WARNING]
-> This is not recommended as the appimage produced by this process isn't a proper appimage.
+> This is not recommended as the appimage produced by this process isn't a proper appimage. It's just a pyinstaller build bundled as an appimage.
 
 > [!IMPORTANT]
 > You will need [Appimagetool](https://github.com/AppImage/appimagetool)

{qcanvas-2.0.3 → qcanvas-2.0.5}/README.md

@@ -14,8 +14,7 @@ https://github.com/QCanvas/QCanvasApp
 
 You can download a **windows** version from [releases](https://github.com/QCanvas/QCanvasApp/releases)
 
-> [!WARNING] 
-> The appimage version is currently broken and may be dropped in the future.
+An appimage version is also available from releases but is not recommended.
 
 # Development/Run from source
 
@@ -42,7 +41,7 @@ poetry run python -m qcanvas
 ## Build custom AppImage
 
 > [!WARNING]
-> This is not recommended as the appimage produced by this process isn't a proper appimage.
+> This is not recommended as the appimage produced by this process isn't a proper appimage. It's just a pyinstaller build bundled as an appimage.
 
 > [!IMPORTANT]
 > You will need [Appimagetool](https://github.com/AppImage/appimagetool)

{qcanvas-2.0.3 → qcanvas-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qcanvas"
-version = "2.0.3"
+version = "2.0.5"
 description = "View courses from Canvas LMS"
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
@@ -16,12 +16,12 @@ qcanvas = "qcanvas:main"
 
 [tool.poetry.dependencies]
 python = ">=3.12,<3.13"
-libqcanvas = "^0.5.4"
+libqcanvas = "^0.5.5"
 #libqcanvas = { path = "../libqcanvas/", develop = true }
 #libqcanvas-clients = { path = "../libqcanvas_clients/", develop = true }
 asynctaskpool = "^0.2.1"
 sqlalchemy = "^2.0.31"
-aiosqlite = "^0.20.0"
+aiosqlite = "^0.21.0"
 pyqtdarktheme-fork = "^2.3.2"
 qasync = "^0.27.1"
 platformdirs = "^4.2.2"
@@ -30,8 +30,7 @@ cachetools = "^5.5.0"
 aiofile = "^3.9.0"
 
 [tool.poetry.group.flatpak-exclude.dependencies]
-pyside6-essentials = "^6.8.0"
-shiboken6 = "6.8.1" # pinned because latest release is ONLY a macos version for some reason
+pyside6-essentials = "^6.9.0"
 setuptools = "^71.1.0"
 pyinstaller = "^6.10.0"
 
@@ -54,4 +53,4 @@ build-backend = "poetry.core.masonry.api"
 "__init__.py" = ["F401"]
 
 [tool.ruff.lint.isort]
-known-first-party = ["libqcanvas_clients", "asynctaskpool", "libqcanvas"]
+known-first-party = ["libqcanvas_clients", "asynctaskpool", "libqcanvas"]

{qcanvas-2.0.3 → qcanvas-2.0.5}/qcanvas/__init__.py

@@ -23,6 +23,7 @@
 # nuitka-project: --nofollow-import-to=yt_dlp.extractor.lazy_extractors
 
 import logging
+import logging.config
 from logging import INFO, WARNING
 
 import qcanvas.app as app
@@ -34,18 +35,23 @@ def main():
 
     logging.basicConfig(
         filemode="w",
-        filename=paths.data_storage() / "debug.log",
+        filename=paths.data_storage() / "qcanvas.log",
         level="WARN",
     )
 
-    logs.set_levels(
-        {
-            "qcanvas": INFO,
-            "qcanvas.ui": WARNING,
-            "libqcanvas": INFO,
-            "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
-        }
-    )
+    log_config = paths.data_storage() / "logging.ini"
+
+    if log_config.exists():
+        logging.config.fileConfig(log_config, disable_existing_loggers=False)
+    else:
+        logs.set_levels(
+            {
+                "qcanvas": INFO,
+                "qcanvas.ui": WARNING,
+                "libqcanvas": INFO,
+                "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
+            }
+        )
 
     app.launch()
 

{qcanvas-2.0.3 → qcanvas-2.0.5}/qcanvas/ui/qcanvas_window/qcanvas_window.py

@@ -234,10 +234,14 @@ class QCanvasWindow(QMainWindow):
         opening_progress_dialog.setWindowTitle("Please wait")
         opening_progress_dialog.show()
 
-        open_url = QUrl(await self._qcanvas.canvas_client.get_temporary_session_url())
-        _logger.info(f"Opening URL {open_url}")
-        QDesktopServices.openUrl(open_url)
-        opening_progress_dialog.close()
+        try:
+            open_url = QUrl(
+                await self._qcanvas.canvas_client.get_temporary_session_url()
+            )
+            _logger.info(f"Opening URL {open_url}")
+            QDesktopServices.openUrl(open_url)
+        finally:
+            opening_progress_dialog.close()
 
     @Slot()
     def _open_downloads_folder(self) -> None: