qcanvas 1.2.2__tar.gz → 2.0.0__tar.gz

{qcanvas-1.2.2 → qcanvas-2.0.0}/PKG-INFO

@@ -1,21 +1,20 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: qcanvas
-Version: 1.2.2
+Version: 2.0.0
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
-Requires-Python: >3.11.0,<3.13
+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: asynctaskpool (>=0.2.1,<0.3.0)
-Requires-Dist: lightdb (>=2.0,<3.0)
+Requires-Dist: cachetools (>=5.5.0,<6.0.0)
+Requires-Dist: libqcanvas (>=0.5.1,<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)
-Requires-Dist: qcanvas-api-clients (>=0.4.0,<0.5.0)
-Requires-Dist: qcanvas-backend (>=0.3.0,<0.4.0)
-Requires-Dist: qtpy (>=2.4.1,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.31,<3.0.0)
 Requires-Dist: validators (>=0.34.0,<0.35.0)
 Description-Content-Type: text/markdown
@@ -43,7 +42,7 @@ based distros.
 
 ## Prerequisites
 
-- Python 3.12+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
+- Python 3.11+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
 - [Pipx](https://pipx.pypa.io/stable/) (optional)
 - Poetry (recommended to install using `pipx install poetry`)
 - [Appimagetool](https://github.com/AppImage/appimagetool) (Only for building the appimage)
@@ -57,15 +56,18 @@ cd QCanvasApp
 # Enter shell and run it
 poetry shell
 poetry install
-python qcanvas/run.py
+python -m qcanvas
 
 # Alternatively you can run it like this:
 poetry install
-poetry run python qcanvas/run.py
+poetry run python -m qcanvas
 ```
 
 ## Build custom AppImage
 
+> [!INFO]
+> This is not recommended as the appimage produced by this process isn't a proper appimage.
+
 ```bash
 bash build_appimage.sh
 ```

{qcanvas-1.2.2 → qcanvas-2.0.0}/README.md

@@ -21,7 +21,7 @@ based distros.
 
 ## Prerequisites
 
-- Python 3.12+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
+- Python 3.11+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
 - [Pipx](https://pipx.pypa.io/stable/) (optional)
 - Poetry (recommended to install using `pipx install poetry`)
 - [Appimagetool](https://github.com/AppImage/appimagetool) (Only for building the appimage)
@@ -35,15 +35,18 @@ cd QCanvasApp
 # Enter shell and run it
 poetry shell
 poetry install
-python qcanvas/run.py
+python -m qcanvas
 
 # Alternatively you can run it like this:
 poetry install
-poetry run python qcanvas/run.py
+poetry run python -m qcanvas
 ```
 
 ## Build custom AppImage
 
+> [!INFO]
+> This is not recommended as the appimage produced by this process isn't a proper appimage.
+
 ```bash
 bash build_appimage.sh
 ```

qcanvas-2.0.0/pyproject.toml

@@ -0,0 +1,57 @@
+[tool.poetry]
+name = "qcanvas"
+version = "2.0.0"
+description = "QCanvas is a desktop client for Canvas LMS."
+authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
+readme = "README.md"
+exclude = [
+    "images",
+    "deploy",
+    "qcanvas/icons/*/*/*.svg",
+    "qcanvas/icons/_update_icons.py",
+]
+
+[tool.poetry.scripts]
+qcanvas = "qcanvas:main"
+
+[tool.poetry.dependencies]
+python = ">=3.12,<3.13"
+libqcanvas = "^0.5.1"
+#libqcanvas = { path = "../libqcanvas/", develop = true }
+#libqcanvas-clients = { path = "../libqcanvas_clients/", develop = true }
+asynctaskpool = "^0.2.1"
+sqlalchemy = "^2.0.31"
+aiosqlite = "^0.20.0"
+pyqtdarktheme-fork = "^2.3.2"
+qasync = "^0.27.1"
+platformdirs = "^4.2.2"
+validators = "^0.34.0"
+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
+setuptools = "^71.1.0"
+pyinstaller = "^6.10.0"
+
+[tool.poetry.group.dev-tools]
+optional = true
+
+[tool.poetry.group.dev-tools.dependencies]
+#nuitka = "^2.4.5"
+rich = "^13.7.1"
+pre-commit = "^4.0.1"
+xmltodict = "^0.13.0"
+mako = "^1.3.8"
+invoke = "^2.2.0"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["libqcanvas_clients", "asynctaskpool", "libqcanvas"]

qcanvas-1.2.2/qcanvas/run.py → qcanvas-2.0.0/qcanvas/__init__.py

@@ -25,30 +25,30 @@
 import logging
 from logging import INFO, WARNING
 
-import qcanvas.app_start
+import qcanvas.app as app
 from qcanvas.util import logs, paths
 
-paths.data_storage().mkdir(parents=True, exist_ok=True)
-
-logging.basicConfig(
-    filemode="w",
-    filename=paths.data_storage() / "debug.log",
-    level="WARN",
-)
-
-logs.set_levels(
-    {
-        "qcanvas": INFO,
-        "qcanvas.ui": WARNING,
-        "qcanvas_backend": INFO,
-        "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
-    }
-)
-
 
 def main():
-    qcanvas.app_start.launch()
+    app.launch()
 
 
 if __name__ == "__main__":
+    paths.data_storage().mkdir(parents=True, exist_ok=True)
+
+    logging.basicConfig(
+        filemode="w",
+        filename=paths.data_storage() / "debug.log",
+        level="WARN",
+    )
+
+    logs.set_levels(
+        {
+            "qcanvas": INFO,
+            "qcanvas.ui": WARNING,
+            "libqcanvas": INFO,
+            "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
+        }
+    )
+
     main()

qcanvas-2.0.0/qcanvas/app.py

@@ -0,0 +1,93 @@
+import asyncio
+import logging
+import sys
+
+from libqcanvas.qcanvas import QCanvas
+from PySide6.QtCore import QObject, Signal, Qt
+from PySide6.QtGui import QGuiApplication
+from PySide6.QtWidgets import QApplication
+from qasync import QEventLoop, asyncSlot
+
+import qcanvas.backend_connectors.qcanvas_task_master as task_master
+from qcanvas.backend_connectors import FrontendResourceManager
+from qcanvas.ui.qcanvas_window import QCanvasWindow
+from qcanvas.ui.setup import SetupDialog, setup_checker
+from qcanvas.util import paths, runtime
+from qcanvas.theme import app_theme
+import qcanvas.settings as settings
+
+_logger = logging.getLogger(__name__)
+app = QApplication(sys.argv)
+
+
+# I couldn't figure out a reliable way of getting the event loop started.
+# This just uses a signal with an async slot to run some async functions and then shows the main window
+class _MainStarter(QObject):
+    _starting = Signal()
+
+    def __init__(self):
+        super().__init__()
+        self._starting.connect(self._start, Qt.ConnectionType.SingleShotConnection)
+
+    def start(self):
+        self._starting.emit()
+
+    @asyncSlot()
+    async def _start(self):
+        _qcanvas = await self._setup_database()
+
+        _main_window = QCanvasWindow(_qcanvas)
+        _main_window.show()
+        self.setParent(_main_window)
+
+    async def _setup_database(self) -> QCanvas[FrontendResourceManager]:
+        _qcanvas = QCanvas[FrontendResourceManager](
+            canvas_config=settings.client.canvas_config,
+            panopto_config=settings.client.panopto_config,
+            storage_path=paths.data_storage(),
+            resource_manager_class=FrontendResourceManager,
+        )
+
+        await _qcanvas.database.upgrade()
+        await _qcanvas.init()
+
+        return _qcanvas
+
+
+def run_setup():
+    event_loop = QEventLoop(app)
+    asyncio.set_event_loop(event_loop)
+
+    app_close_event = asyncio.Event()
+    app.aboutToQuit.connect(app_close_event.set, Qt.ConnectionType.SingleShotConnection)
+
+    setup_window = SetupDialog()
+    setup_window.show()
+
+    with event_loop:
+        event_loop.run_until_complete(app_close_event.wait())
+
+
+def launch():
+    if runtime.is_running_as_flatpak:
+        QGuiApplication.setDesktopFileName("io.github.qcanvas.QCanvasApp")
+
+    app.setApplicationName("QCanvas")
+
+    task_master.register()
+    app_theme.theme = settings.ui.theme
+
+    if setup_checker.needs_setup():
+        run_setup()
+
+    event_loop = QEventLoop(app)
+    asyncio.set_event_loop(event_loop)
+
+    app_close_event = asyncio.Event()
+    app.aboutToQuit.connect(app_close_event.set, Qt.ConnectionType.SingleShotConnection)
+
+    _main = _MainStarter()
+    _main.start()
+
+    with event_loop:
+        event_loop.run_until_complete(app_close_event.wait())

{qcanvas-1.2.2 → qcanvas-2.0.0}/qcanvas/backend_connectors/frontend_resource_manager.py

@@ -2,11 +2,14 @@ import logging
 from abc import ABCMeta
 from pathlib import Path
 
-import qcanvas_backend.database.types as db
-from qcanvas_backend.database import QCanvasDatabase
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.resources.extracting.extractors import Extractors
-from qtpy.QtCore import QObject, Signal
+from PySide6.QtGui import QDesktopServices
+from libqcanvas import db
+from libqcanvas.database import QCanvasDatabase
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.resources.extracting.extractors import Extractors
+from PySide6.QtCore import QObject, Signal
+
+from qcanvas.util.qurl_util import file_url
 
 _logger = logging.getLogger(__name__)
 
@@ -29,6 +32,11 @@ class FrontendResourceManager(QObject, ResourceManager, metaclass=_Meta):
             database=database, download_dest=download_dest, extractors=extractors
         )
 
+    async def download_and_open(self, resource: db.Resource) -> None:
+        await self.download(resource)
+        resource_path = file_url(self.resource_download_location(resource))
+        QDesktopServices.openUrl(resource_path)
+
     def on_download_progress(
         self, resource: db.Resource, current: int, total: int
     ) -> None:

{qcanvas-1.2.2 → qcanvas-2.0.0}/qcanvas/backend_connectors/qcanvas_task_master.py

@@ -1,8 +1,8 @@
 import logging
 from abc import ABCMeta
 
-from qcanvas_backend.task_master import TaskID, TaskMaster, set_global_task_master
-from qtpy.QtCore import QObject, Signal
+from libqcanvas.task_master import TaskID, TaskMaster, set_global_task_master
+from PySide6.QtCore import QObject, Signal
 
 _logger = logging.getLogger(__name__)
 

{qcanvas-1.2.2 → qcanvas-2.0.0}/qcanvas/icons/__init__.py

@@ -1,9 +1,8 @@
-from qtpy.QtGui import QIcon
-
-from ._icon_type import ThemeIcon, UniversalIcon
 from .rc_icons import (
-    qt_resource_data as _,  # Without this, icon data will not be loaded
-)
+    qt_resource_data as _,
+)  # Without this, icon data will not be loaded
+from ._icon_type import UniversalIcon, ThemeIcon
+from PySide6.QtGui import QIcon
 
 
 # noinspection PyPep8Naming
@@ -26,6 +25,7 @@ class options:
     auto_download = QIcon.fromTheme("options/auto_download")
     ignore_old = QIcon.fromTheme("options/ignore_old")
     include_videos = QIcon.fromTheme("options/include_videos")
+    sync_on_start = QIcon.fromTheme("options/sync_on_start")
     theme = QIcon.fromTheme("options/theme")
 
 

{qcanvas-1.2.2 → qcanvas-2.0.0}/qcanvas/icons/_icon_type.py

@@ -1,7 +1,7 @@
 # Unused
 import logging
 
-from qtpy.QtGui import QIcon
+from PySide6.QtGui import QIcon
 
 _logger = logging.getLogger(__name__)
 

qcanvas-2.0.0/qcanvas/icons/icons.qrc

@@ -0,0 +1,50 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+	<qresource prefix="icons/">
+		<file>dark/actions/exit.svg</file>
+		<file>dark/actions/mark_all_read.svg</file>
+		<file>dark/actions/open_downloads.svg</file>
+		<file>dark/actions/quick_login.svg</file>
+		<file>dark/actions/sync.svg</file>
+		<file>dark/branding/logo_transparent.svg</file>
+		<file>dark/options/auto_download.svg</file>
+		<file>dark/options/ignore_old.svg</file>
+		<file>dark/options/include_videos.svg</file>
+		<file>dark/options/sync_on_start.svg</file>
+		<file>dark/options/theme.svg</file>
+		<file>dark/tabs/assignments.svg</file>
+		<file>dark/tabs/mail.svg</file>
+		<file>dark/tabs/pages.svg</file>
+		<file>dark/tree_items/assignment.svg</file>
+		<file>dark/tree_items/mail.svg</file>
+		<file>dark/tree_items/module.svg</file>
+		<file>dark/tree_items/page.svg</file>
+		<file>light/actions/exit.svg</file>
+		<file>light/actions/mark_all_read.svg</file>
+		<file>light/actions/open_downloads.svg</file>
+		<file>light/actions/quick_login.svg</file>
+		<file>light/actions/sync.svg</file>
+		<file>light/branding/logo_transparent.svg</file>
+		<file>light/options/auto_download.svg</file>
+		<file>light/options/ignore_old.svg</file>
+		<file>light/options/include_videos.svg</file>
+		<file>light/options/sync_on_start.svg</file>
+		<file>light/options/theme.svg</file>
+		<file>light/tabs/assignments.svg</file>
+		<file>light/tabs/mail.svg</file>
+		<file>light/tabs/pages.svg</file>
+		<file>light/tree_items/assignment.svg</file>
+		<file>light/tree_items/mail.svg</file>
+		<file>light/tree_items/module.svg</file>
+		<file>light/tree_items/page.svg</file>
+		<file>universal/branding/main_icon.svg</file>
+		<file>universal/downloads/download_failed.svg</file>
+		<file>universal/downloads/downloaded.svg</file>
+		<file>universal/downloads/not_downloaded.svg</file>
+		<file>universal/downloads/unknown.svg</file>
+		<file>universal/tabs/assignments_new_content.svg</file>
+		<file>universal/tabs/mail_new_content.svg</file>
+		<file>universal/tabs/pages_new_content.svg</file>
+		<file>universal/tree_items/semester.svg</file>
+	</qresource>
+</RCC>