qcanvas 1.0.9.dev1__tar.gz → 1.0.10__tar.gz

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.9.dev1
+Version: 1.0.10
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
@@ -15,7 +15,7 @@ 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.2.2,<0.3.0)
-Requires-Dist: qcanvas-backend (==0.1.10a5)
+Requires-Dist: qcanvas-backend (==0.1.10)
 Requires-Dist: qtpy (>=2.4.1,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.31,<3.0.0)
 Requires-Dist: validators (>=0.33.0,<0.34.0)
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 # QCanvas
 
-QCanvas is a desktop client for Canvas LMS.
+QCanvas is an **unofficial** desktop client for Canvas LMS.
 
 # Downloads
 

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/README.md

@@ -1,6 +1,6 @@
 # QCanvas
 
-QCanvas is a desktop client for Canvas LMS.
+QCanvas is an **unofficial** desktop client for Canvas LMS.
 
 # Downloads
 

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.9.dev1"
+version = "1.0.10"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
@@ -17,7 +17,7 @@ qcanvas = "qcanvas.run:main"
 [tool.poetry.dependencies]
 python = ">=3.11,<3.13"
 qcanvas-api-clients = "^0.2.2"
-qcanvas-backend = "0.1.10a5"
+qcanvas-backend = "0.1.10"
 asynctaskpool = "^0.2.1"
 sqlalchemy = "^2.0.31"
 qtpy = "^2.4.1"

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/app_start/__init__.py

@@ -1,17 +1,21 @@
 import asyncio
+import logging
 import sys
 
+import qtpy
 from qasync import QEventLoop
 from qtpy.QtWidgets import QApplication
 
 import qcanvas.backend_connectors.qcanvas_task_master as task_master
 from qcanvas.ui.main_ui.qcanvas_window import QCanvasWindow
 from qcanvas.ui.setup import SetupDialog, setup_checker
-from qcanvas.util import themes, settings
+from qcanvas.util import settings, themes
 
 main_window = None
 setup_window = None
 
+_logger = logging.getLogger(__name__)
+
 
 def _show_main():
     global main_window
@@ -19,7 +23,14 @@ def _show_main():
     main_window.show()
 
 
+def _show_qt_api_name():
+    print(f"Using Qt bindings from {qtpy.API_NAME}")
+    _logger.info("Using Qt bindings from %s", qtpy.API_NAME)
+
+
 def launch():
+    _show_qt_api_name()
+
     app = QApplication(sys.argv)
     app.setApplicationName("QCanvas")
 

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/backend_connectors/frontend_resource_manager.py

@@ -1,17 +1,13 @@
 import logging
 from abc import ABCMeta
 from pathlib import Path
-from threading import Lock
 
 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 qcanvas_backend.task_master import TaskID
 from qtpy.QtCore import QObject, Signal
 
-from qcanvas.backend_connectors.qcanvas_task_master import task_master
-
 _logger = logging.getLogger(__name__)
 
 
@@ -21,6 +17,7 @@ class _Meta(type(QObject), ABCMeta): ...
 class FrontendResourceManager(QObject, ResourceManager, metaclass=_Meta):
     download_finished = Signal(db.Resource)
     download_failed = Signal(db.Resource)
+    download_progress = Signal(db.Resource, int, int)
 
     def __init__(
         self,
@@ -31,32 +28,13 @@ class FrontendResourceManager(QObject, ResourceManager, metaclass=_Meta):
         super().__init__(
             database=database, download_dest=download_dest, extractors=extractors
         )
-        self._lock = Lock()
-        self._download_tasks: dict[str, TaskID] = {}
 
-    # todo will need more signals
     def on_download_progress(
         self, resource: db.Resource, current: int, total: int
     ) -> None:
-        with self._lock:
-            if resource.id not in self._download_tasks:
-                task = TaskID("Download", resource.file_name)
-                self._download_tasks[resource.id] = task
-            elif current == total and total != 0:
-                task = self._download_tasks.pop(resource.id, None)
-            else:
-                task = self._download_tasks[resource.id]
-
-        task_master.report_progress(task, current, total)
+        self.download_progress.emit(resource, current, total)
 
     def on_download_failed(self, resource: db.Resource) -> None:
-        with self._lock:
-            task = self._download_tasks.pop(
-                resource.id, TaskID("Download", resource.file_name)
-            )
-
-        task_master.report_failed(task, "Download failed")
-
         self.download_failed.emit(resource)
 
     def on_download_finished(self, resource: db.Resource) -> None:

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/content_tree.py

@@ -21,7 +21,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
 
     @classmethod
     def create_from_receipt(
-        cls: U, course: db.Course, *, sync_receipt: Optional[SyncReceipt]
+        cls: U, course: db.Course, *, sync_receipt: SyncReceipt
     ) -> Type[U]:
         tree = cls(course.id)
         tree.reload(course, sync_receipt=sync_receipt)
@@ -57,7 +57,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
         self.setMaximumWidth(max_width)
         self.setMinimumWidth(min_width)
 
-    def reload(self, data: T, *, sync_receipt: Optional[SyncReceipt]) -> None:
+    def reload(self, data: T, *, sync_receipt: SyncReceipt) -> None:
         self._reloading = True
 
         try:
@@ -76,7 +76,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
 
     @abstractmethod
     def create_tree_items(
-        self, data: T, sync_receipt: Optional[SyncReceipt]
+        self, data: T, sync_receipt: SyncReceipt
     ) -> Sequence[MemoryTreeWidgetItem]: ...
 
     @Slot(QItemSelection, QItemSelection)

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/course_tree.py

@@ -52,7 +52,7 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
         self.ui_setup(max_width=250, min_width=150, header_text="Courses")
 
     def create_tree_items(
-        self, terms: List[db.Term], sync_receipt: Optional[SyncReceipt]
+        self, terms: List[db.Term], sync_receipt: SyncReceipt
     ) -> Sequence[MemoryTreeWidgetItem]:
         widgets = []
 
@@ -69,13 +69,11 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
         return widgets
 
     def _create_course_widget(
-        self, course: db.Course, sync_receipt: Optional[SyncReceipt]
+        self, course: db.Course, sync_receipt: SyncReceipt
     ) -> _CourseTreeItem:
         course_widget = _CourseTreeItem(course, self)
 
-        is_new = sync_receipt is not None and course.id in sync_receipt.updated_courses
-
-        if is_new:
+        if sync_receipt.was_updated(course):
             self.mark_as_unseen(course_widget)
 
         return course_widget

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/course_viewer.py

@@ -1,9 +1,9 @@
 import logging
-from typing import Optional
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
+from qtpy.QtCore import Slot
 from qtpy.QtWidgets import *
 
 from qcanvas.ui.course_viewer.tabs.assignment_tab import AssignmentTab
@@ -22,41 +22,87 @@ class CourseViewer(QWidget):
         course: db.Course,
         downloader: ResourceManager,
         *,
-        initial_sync_receipt: Optional[SyncReceipt] = None
+        sync_receipt: SyncReceipt
     ):
         super().__init__()
         # todo this is a mess. there are several other messes like this too, do they all have to be a mess?
+        self._course_id = course.id
+
         self._course_label = QLabel(course.name)
         self._course_label.setFont(bold_font)
         make_truncatable(self._course_label)
+
         self._pages_tab = PageTab.create_from_receipt(
             course=course,
             downloader=downloader,
-            sync_receipt=initial_sync_receipt,
+            sync_receipt=sync_receipt,
         )
         self._assignments_tab = AssignmentTab.create_from_receipt(
             course=course,
             downloader=downloader,
-            sync_receipt=initial_sync_receipt,
+            sync_receipt=sync_receipt,
         )
         self._mail_tab = MailTab.create_from_receipt(
             course=course,
             downloader=downloader,
-            sync_receipt=initial_sync_receipt,
+            sync_receipt=sync_receipt,
         )
-        self._tabs = QTabWidget()
+        # self._files_tab = FileTab.create_from_receipt(
+        #     course=course,
+        #     downloader=downloader,
+        #     sync_receipt=sync_receipt,
+        # )
 
+        self._tabs = QTabWidget()
         self._tabs.addTab(self._pages_tab, "Pages")
         self._tabs.addTab(self._assignments_tab, "Assignments")
         self._tabs.addTab(self._mail_tab, "Mail")
-        # todo: move back to first when implemented
         self._tabs.addTab(QLabel("Not implemented"), "Files")
-        # self._tabs.addTab(QLabel("Not implemented"), "Panopto") The meme lives on!
+        # self._tabs.addTab(self._files_tab, "Files")
+        # self._tabs.addTab(QLabel("Not implemented"), "Panopto")  # The meme lives on!
 
         self.setLayout(layout(QVBoxLayout, self._course_label, self._tabs))
 
-    def reload(self, course: db.Course, *, sync_receipt: Optional[SyncReceipt]) -> None:
-        # self._tabs.setTabText(1, "*Pages")
+        self._tabs.currentChanged.connect(self._tab_changed)
+
+        self._highlight_tabs(sync_receipt)
+        self._unhighlight_tab(0)  # Because the first tab always gets auto-selected
+
+    def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
         self._pages_tab.reload(course, sync_receipt=sync_receipt)
         self._assignments_tab.reload(course, sync_receipt=sync_receipt)
         self._mail_tab.reload(course, sync_receipt=sync_receipt)
+
+        self._highlight_tabs(sync_receipt)
+
+    @Slot(int)
+    def _tab_changed(self, index: int) -> None:
+        if index != -1:
+            self._unhighlight_tab(index)
+
+    def _highlight_tabs(self, sync_receipt: SyncReceipt) -> None:
+        updates = sync_receipt.updates_by_course.get(self._course_id, None)
+
+        if updates is not None:
+            if len(updates.updated_resources) > 0:
+                self._highlight_tab(0)
+
+            if len(updates.updated_pages) > 0:
+                self._highlight_tab(1)
+
+            if len(updates.updated_assignments) > 0:
+                self._highlight_tab(2)
+
+            if len(updates.updated_messages) > 0:
+                self._highlight_tab(3)
+        else:
+            for index in range(0, 4):
+                self._unhighlight_tab(index)
+
+    def _highlight_tab(self, tab_index: int) -> None:
+        self._tabs.setTabText(tab_index, "* " + self._tabs.tabText(tab_index))
+
+    def _unhighlight_tab(self, tab_index: int) -> None:
+        self._tabs.setTabText(
+            tab_index, self._tabs.tabText(tab_index).replace("* ", "")
+        )

qcanvas-1.0.10/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py

@@ -0,0 +1,68 @@
+import logging
+
+import qcanvas_backend.database.types as db
+from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
+from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
+from qtpy.QtWidgets import *
+
+from qcanvas.ui.course_viewer.tabs.assignment_tab.assignment_tree import AssignmentTree
+from qcanvas.ui.course_viewer.tabs.content_tab import ContentTab
+from qcanvas.ui.course_viewer.tabs.util import date_strftime_format
+from qcanvas.util.basic_fonts import bold_label
+from qcanvas.util.layouts import grid_layout
+
+_logger = logging.getLogger(__name__)
+
+
+class AssignmentTab(ContentTab):
+
+    def __init__(
+        self,
+        *,
+        course: db.Course,
+        sync_receipt: SyncReceipt,
+        downloader: ResourceManager,
+    ):
+        super().__init__(
+            explorer=AssignmentTree.create_from_receipt(
+                course, sync_receipt=sync_receipt
+            ),
+            title_placeholder_text="No assignment selected",
+            downloader=downloader,
+        )
+
+        self._due_date_label = QLabel("")
+        self._score_label = QLabel("")
+
+        self.enable_info_grid()
+
+    def setup_info_grid(self) -> QGridLayout:
+        grid = grid_layout(
+            [
+                [
+                    bold_label("Due:"),
+                    self._due_date_label,
+                ],
+                [
+                    bold_label("Score:"),
+                    self._score_label,
+                ],
+            ]
+        )
+
+        grid.setColumnStretch(0, 0)
+        grid.setColumnStretch(1, 1)
+
+        return grid
+
+    def update_info_grid(self, assignment: db.Assignment) -> None:
+        if assignment.due_date is not None:
+            due_text = assignment.due_date.strftime(date_strftime_format)
+        else:
+            due_text = "?"
+
+        self._due_date_label.setText(due_text)
+
+        self._score_label.setText(
+            f"{assignment.mark or '?'}/{assignment.max_mark_possible or '?'}"
+        )

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, Sequence
+from typing import Sequence
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
@@ -34,7 +34,7 @@ class AssignmentTree(ContentTree[db.Course]):
         header.setStretchLastSection(False)
 
     def create_tree_items(
-        self, course: db.Course, sync_receipt: Optional[SyncReceipt]
+        self, course: db.Course, sync_receipt: SyncReceipt
     ) -> Sequence[MemoryTreeWidgetItem]:
         widgets = []
 
@@ -64,12 +64,7 @@ class AssignmentTree(ContentTree[db.Course]):
 
         assignment_group_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
 
-        is_new = (
-            sync_receipt is not None
-            and assignment_group.id in sync_receipt.updated_assignment_groups
-        )
-
-        if is_new:
+        if sync_receipt.was_updated(assignment_group):
             self.mark_as_unseen(assignment_group_widget)
 
         return assignment_group_widget
@@ -85,12 +80,7 @@ class AssignmentTree(ContentTree[db.Course]):
             Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
         )
 
-        is_new = (
-            sync_receipt is not None
-            and assignment.id in sync_receipt.updated_assignments
-        )
-
-        if is_new:
+        if sync_receipt.was_updated(assignment):
             self.mark_as_unseen(assignment_widget)
 
         return assignment_widget

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/content_tab.py

@@ -23,7 +23,7 @@ class ContentTab(QWidget):
         cls: T,
         *,
         course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
+        sync_receipt: SyncReceipt,
         downloader: ResourceManager,
     ) -> Type[T]:
         return cls(course=course, sync_receipt=sync_receipt, downloader=downloader)
@@ -80,7 +80,7 @@ class ContentTab(QWidget):
 
         self.setLayout(parent_layout)
 
-    def reload(self, course: db.Course, *, sync_receipt: Optional[SyncReceipt]) -> None:
+    def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
         self._explorer.reload(course, sync_receipt=sync_receipt)
 
     @Slot(object)

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/mail_tab/mail_tab.py

@@ -21,7 +21,7 @@ class MailTab(ContentTab):
         self,
         *,
         course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
+        sync_receipt: SyncReceipt,
         downloader: ResourceManager,
     ):
         super().__init__(

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/mail_tab/mail_tree.py

@@ -34,7 +34,7 @@ class MailTree(ContentTree[db.Course]):
         header.setStretchLastSection(False)
 
     def create_tree_items(
-        self, course: db.Course, sync_receipt: Optional[SyncReceipt]
+        self, course: db.Course, sync_receipt: SyncReceipt
     ) -> Sequence[MemoryTreeWidgetItem]:
         widgets = []
 
@@ -45,7 +45,7 @@ class MailTree(ContentTree[db.Course]):
         return widgets
 
     def _create_mail_widget(
-        self, message: db.CourseMessage, sync_receipt: Optional[SyncReceipt]
+        self, message: db.CourseMessage, sync_receipt: SyncReceipt
     ) -> MemoryTreeWidgetItem:
         message_widget = MemoryTreeWidgetItem(
             id=message.id,
@@ -53,11 +53,7 @@ class MailTree(ContentTree[db.Course]):
             strings=[message.name, message.sender_name],
         )
 
-        is_new = (
-            sync_receipt is not None and message.id in sync_receipt.updated_messages
-        )
-
-        if is_new:
+        if sync_receipt.was_updated(message):
             self.mark_as_unseen(message_widget)
 
         return message_widget

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/page_tab/page_tab.py

@@ -1,5 +1,4 @@
 import logging
-from typing import *
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
@@ -16,7 +15,7 @@ class PageTab(ContentTab):
         self,
         *,
         course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
+        sync_receipt: SyncReceipt,
         downloader: ResourceManager,
     ):
         super().__init__(

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py

@@ -22,7 +22,7 @@ class PageTree(ContentTree[db.Course]):
         )
 
     def create_tree_items(
-        self, course: db.Course, sync_receipt: Optional[SyncReceipt]
+        self, course: db.Course, sync_receipt: SyncReceipt
     ) -> Sequence[MemoryTreeWidgetItem]:
         widgets = []
 
@@ -37,30 +37,26 @@ class PageTree(ContentTree[db.Course]):
         return widgets
 
     def _create_module_widget(
-        self, module: db.Module, sync_receipt: Optional[SyncReceipt]
+        self, module: db.Module, sync_receipt: SyncReceipt
     ) -> MemoryTreeWidgetItem:
         module_widget = MemoryTreeWidgetItem(
             id=module.id, data=module, strings=[module.name]
         )
         module_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
 
-        # todo add some helpers to SyncReceipt to make this less shit, and maybe use an empty syncreceipt instead of None
-        is_new = sync_receipt is not None and module.id in sync_receipt.updated_modules
-
-        if is_new:
+        # Todo not sure if modules should get highlighted since they can't be unhighlighted by selecting them...
+        if sync_receipt.was_updated(module):
             self.mark_as_unseen(module_widget)
 
         return module_widget
 
     def _create_page_widget(
-        self, page: db.ModulePage, sync_receipt: Optional[SyncReceipt]
+        self, page: db.ModulePage, sync_receipt: SyncReceipt
     ) -> MemoryTreeWidgetItem:
         page_widget = MemoryTreeWidgetItem(id=page.id, data=page, strings=[page.name])
         page_widget.setFlags(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable)
 
-        is_new = sync_receipt is not None and page.id in sync_receipt.updated_pages
-
-        if is_new:
+        if sync_receipt.was_updated(page):
             self.mark_as_unseen(page_widget)
 
         return page_widget

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/main_ui/course_viewer_container.py

@@ -3,7 +3,7 @@ from typing import *
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
+from qcanvas_backend.net.sync.sync_receipt import SyncReceipt, empty_receipt
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import *
 
@@ -18,7 +18,7 @@ class CourseViewerContainer(QStackedWidget):
         self._course_viewers: dict[str, CourseViewer] = {}
         self._downloader = downloader
         self._last_course_id: Optional[str] = None
-        self._last_sync_receipt: Optional[SyncReceipt] = None
+        self._last_sync_receipt: SyncReceipt = empty_receipt()
         self._placeholder = QLabel("No Course Selected")
         self._placeholder.setAlignment(Qt.AlignmentFlag.AlignCenter)
         self.addWidget(self._placeholder)
@@ -32,7 +32,7 @@ class CourseViewerContainer(QStackedWidget):
             viewer = CourseViewer(
                 course=course,
                 downloader=self._downloader,
-                initial_sync_receipt=self._last_sync_receipt,
+                sync_receipt=self._last_sync_receipt,
             )
             self._course_viewers[course.id] = viewer
             self.addWidget(viewer)
@@ -43,7 +43,7 @@ class CourseViewerContainer(QStackedWidget):
         self._last_course_id = course.id
 
     async def reload_all(
-        self, courses: Sequence[db.Course], *, sync_receipt: Optional[SyncReceipt]
+        self, courses: Sequence[db.Course], *, sync_receipt: SyncReceipt
     ) -> None:
         self._last_sync_receipt = sync_receipt
         for course in courses:

qcanvas-1.0.10/qcanvas/ui/main_ui/options/auto_download_resources_option.py

@@ -0,0 +1,41 @@
+import logging
+from typing import *
+
+from qtpy.QtCore import Slot
+from qtpy.QtGui import QAction
+from qtpy.QtWidgets import QMenu
+
+from qcanvas.util import settings
+
+_logger = logging.getLogger(__name__)
+
+
+class _EnableAutoDownloadOption(QAction):
+    def __init__(self, parent: Optional[QMenu] = None):
+        super().__init__("Enable", parent)
+        self.setCheckable(True)
+        self.setChecked(settings.client.download_new_resources)
+        self.triggered.connect(self._triggered)
+
+    @Slot()
+    def _triggered(self) -> None:
+        settings.client.download_new_resources = self.isChecked()
+
+
+class _EnableVideoDownloadOption(QAction):
+    def __init__(self, parent: Optional[QMenu] = None):
+        super().__init__("Include videos (slow)", parent)
+        self.setCheckable(True)
+        self.setChecked(settings.client.download_new_videos)
+        self.triggered.connect(self._triggered)
+
+    @Slot()
+    def _triggered(self) -> None:
+        settings.client.download_new_videos = self.isChecked()
+
+
+class AutoDownloadResourcesMenu(QMenu):
+    def __init__(self, parent: Optional[QMenu] = None):
+        super().__init__("Download new resources", parent)
+        self.addAction(_EnableAutoDownloadOption(self))
+        self.addAction(_EnableVideoDownloadOption(self))

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/main_ui/options/theme_selection_menu.py

@@ -1,11 +1,10 @@
 import logging
 
 from qtpy.QtCore import Slot
-from qtpy.QtGui import QAction
-from qtpy.QtGui import QActionGroup
+from qtpy.QtGui import QAction, QActionGroup
 from qtpy.QtWidgets import QMenu
 
-from qcanvas.util import themes, settings
+from qcanvas.util import settings, themes
 
 _logger = logging.getLogger(__name__)
 

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/ui/main_ui/qcanvas_window.py

@@ -1,11 +1,12 @@
 import logging
-from threading import Semaphore
+from threading import BoundedSemaphore
 from typing import *
 
+import httpx
 import qcanvas_backend.database.types as db
 from qasync import asyncSlot
 from qcanvas_backend.database.data_monolith import DataMonolith
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
+from qcanvas_backend.net.sync.sync_receipt import SyncReceipt, empty_receipt
 from qcanvas_backend.qcanvas import QCanvas
 from qtpy.QtCore import QUrl, Signal, Slot
 from qtpy.QtGui import QDesktopServices, QIcon, QKeySequence
@@ -15,11 +16,14 @@ from qcanvas import icons
 from qcanvas.backend_connectors import FrontendResourceManager
 from qcanvas.ui.course_viewer import CourseTree
 from qcanvas.ui.main_ui.course_viewer_container import CourseViewerContainer
+from qcanvas.ui.main_ui.options.auto_download_resources_option import (
+    AutoDownloadResourcesMenu,
+)
 from qcanvas.ui.main_ui.options.quick_sync_option import QuickSyncOption
 from qcanvas.ui.main_ui.options.sync_on_start_option import SyncOnStartOption
 from qcanvas.ui.main_ui.options.theme_selection_menu import ThemeSelectionMenu
 from qcanvas.ui.main_ui.status_bar_progress_display import StatusBarProgressDisplay
-from qcanvas.util import paths, settings
+from qcanvas.util import paths, settings, auto_downloader
 from qcanvas.util.qurl_util import file_url
 from qcanvas.util.ui_tools import create_qaction
 
@@ -35,7 +39,7 @@ class QCanvasWindow(QMainWindow):
         self.setWindowTitle("QCanvas")
         self.setWindowIcon(QIcon(icons.main_icon))
 
-        self._operation_semaphore = Semaphore()
+        self._operation_semaphore = BoundedSemaphore()
         self._data: Optional[DataMonolith] = None
         self._qcanvas = QCanvas[FrontendResourceManager](
             canvas_config=settings.client.canvas_config,
@@ -101,7 +105,8 @@ class QCanvasWindow(QMainWindow):
 
         options_menu.addAction(QuickSyncOption(options_menu))
         options_menu.addAction(SyncOnStartOption(options_menu))
-        options_menu.addMenu(ThemeSelectionMenu(self))
+        options_menu.addMenu(AutoDownloadResourcesMenu(options_menu))
+        options_menu.addMenu(ThemeSelectionMenu(options_menu))
 
     def _restore_window_position(self):
         if settings.ui.last_geometry is not None:
@@ -136,7 +141,7 @@ class QCanvasWindow(QMainWindow):
     @asyncSlot()
     async def _on_app_loaded(self) -> None:
         await self._qcanvas.init()
-        self._course_tree.reload(await self._get_terms(), sync_receipt=None)
+        self._course_tree.reload(await self._get_terms(), sync_receipt=empty_receipt())
 
         if settings.client.sync_on_start:
             await self._synchronise()
@@ -151,27 +156,45 @@ class QCanvasWindow(QMainWindow):
             return
 
         try:
-            # todo handle exceptions and PROGRESS!! better
             self._sync_button.setText("Sync in progress...")
             receipt = await self._qcanvas.synchronise_canvas(
                 quick_sync=settings.client.quick_sync_enabled
             )
             await self._reload(receipt)
-            self._sync_button.setText("Synchronise")
         except Exception as e:
+            _logger.warning("Sync failed", exc_info=e)
             error = QErrorMessage(self)
-            error.showMessage(str(e))
+            msg = str(e)
+
+            if isinstance(e, httpx.ConnectError):
+                msg = "You may not be connected to the internet\n - " + msg
 
-            raise e
+            error.showMessage(msg)
         finally:
             self._operation_semaphore.release()
+            self._sync_button.setText("Synchronise")
 
-    async def _reload(self, receipt: Optional[SyncReceipt]) -> None:
+        try:
+            if settings.client.download_new_resources:
+                # noinspection PyUnboundLocalVariable
+                await auto_downloader.download_new_resources(
+                    all_resources=await self._get_resources(),
+                    receipt=receipt,
+                    downloader=self._qcanvas.resource_manager,
+                    parent_window=self,
+                )
+        except NameError:
+            pass
+
+    async def _reload(self, receipt: SyncReceipt) -> None:
         self._course_tree.reload(await self._get_terms(), sync_receipt=receipt)
         await self._course_viewer_container.reload_all(
             await self._get_courses(), sync_receipt=receipt
         )
 
+    async def _get_resources(self) -> Dict[str, db.Resource]:
+        return (await self._qcanvas.get_data()).resources
+
     async def _get_terms(self) -> Sequence[db.Term]:
         return (await self._qcanvas.get_data()).terms
 

qcanvas-1.0.10/qcanvas/util/auto_downloader.py

@@ -0,0 +1,62 @@
+import asyncio
+import logging
+
+import qcanvas_backend.database.types as db
+from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
+from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
+from qtpy.QtWidgets import QMessageBox
+from qtpy.QtWidgets import QWidget
+
+from qcanvas.util import settings
+
+_logger = logging.getLogger(__name__)
+
+
+async def download_new_resources(
+    *,
+    all_resources: dict[str, db.Resource],
+    receipt: SyncReceipt,
+    downloader: ResourceManager,
+    parent_window: QWidget,
+) -> None:
+    resources_to_download = []
+
+    for file_id in receipt.updated_resources:
+        resource = all_resources[file_id]
+
+        if _should_auto_download_resource(resource, resource_manager=downloader):
+            resources_to_download.append(resource)
+
+    resource_count = len(resources_to_download)
+
+    if resource_count == 0:
+        return
+    elif resource_count > 20:
+        msg = _confirmation_messagebox(resource_count, parent_window)
+        msg.show()
+        msg.accepted.connect(
+            lambda: asyncio.get_running_loop().create_task(
+                downloader.batch_download(resources_to_download),
+            )
+        )
+    else:
+        await downloader.batch_download(resources_to_download)
+
+
+def _should_auto_download_resource(
+    resource: db.Resource, resource_manager: ResourceManager
+) -> bool:
+    return settings.client.download_new_videos or not resource_manager.is_video(
+        resource
+    )
+
+
+def _confirmation_messagebox(resource_count: int, parent: QWidget) -> QMessageBox:
+    return QMessageBox(
+        QMessageBox.Icon.Question,
+        "Many files to download",
+        f"You are about to download {resource_count} new files.\n"
+        "Do you want to continue?",
+        QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
+        parent=parent,
+    )

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/util/settings/_client_settings.py

@@ -15,8 +15,10 @@ class _ClientSettings:
     canvas_url: MappedSetting[Optional[str]] = MappedSetting(default=None)
     canvas_api_key: MappedSetting[Optional[str]] = MappedSetting(default=None)
     panopto_url: MappedSetting[Optional[str]] = MappedSetting(default=None)
-    quick_sync_enabled: BoolSetting = BoolSetting(default=False)
-    sync_on_start: BoolSetting = BoolSetting(default=False)
+    quick_sync_enabled = BoolSetting(default=False)
+    sync_on_start = BoolSetting(default=False)
+    download_new_resources = BoolSetting(default=False)
+    download_new_videos = BoolSetting(default=False)
 
     @property
     def canvas_config(self) -> CanvasClientConfig:

{qcanvas-1.0.9.dev1 → qcanvas-1.0.10}/qcanvas/util/settings/_ui_settings.py

@@ -3,7 +3,7 @@ import logging
 from qtpy.QtCore import QByteArray, QSettings
 
 from qcanvas.util.settings._mapped_setting import MappedSetting
-from qcanvas.util.themes import ensure_theme_is_valid, default_theme
+from qcanvas.util.themes import default_theme, ensure_theme_is_valid
 
 _logger = logging.getLogger(__name__)
 

qcanvas-1.0.9.dev1/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py

@@ -1,158 +0,0 @@
-import logging
-from typing import *
-
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtWidgets import *
-
-from qcanvas.ui.course_viewer.tabs.assignment_tab.assignment_tree import AssignmentTree
-from qcanvas.ui.course_viewer.tabs.content_tab import ContentTab
-from qcanvas.ui.course_viewer.tabs.util import date_strftime_format
-from qcanvas.util.basic_fonts import bold_label
-from qcanvas.util.layouts import grid_layout
-
-_logger = logging.getLogger(__name__)
-
-
-class AssignmentTab(ContentTab):
-
-    def __init__(
-        self,
-        *,
-        course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
-        downloader: ResourceManager,
-    ):
-        super().__init__(
-            explorer=AssignmentTree.create_from_receipt(
-                course, sync_receipt=sync_receipt
-            ),
-            title_placeholder_text="No assignment selected",
-            downloader=downloader,
-        )
-
-        self._due_date_label = QLabel("")
-        self._score_label = QLabel("")
-
-        self.enable_info_grid()
-
-    def setup_info_grid(self) -> QGridLayout:
-        grid = grid_layout(
-            [
-                [
-                    bold_label("Due:"),
-                    self._due_date_label,
-                ],
-                [
-                    bold_label("Score:"),
-                    self._score_label,
-                ],
-            ]
-        )
-
-        grid.setColumnStretch(0, 0)
-        grid.setColumnStretch(1, 1)
-
-        return grid
-
-    def update_info_grid(self, assignment: db.Assignment) -> None:
-        if assignment.due_date is not None:
-            due_text = assignment.due_date.strftime(date_strftime_format)
-        else:
-            due_text = "?"
-
-        self._due_date_label.setText(due_text)
-
-        self._score_label.setText(
-            f"{assignment.mark or '?'}/{assignment.max_mark_possible or '?'}"
-        )
-
-    # def __init__(
-    #     self,
-    #     course: db.Course,
-    #     resource_manager: ResourceManager,
-    #     *,
-    #     initial_sync_receipt: Optional[SyncReceipt] = None,
-    # ):
-    #     super().__init__()
-    #     self._assignment_tree = AssignmentTree(
-    #         course, sync_receipt=initial_sync_receipt
-    #     )
-    #     self._placeholder_assignment_title = "No assignment selected"
-    #     self._assignment_label = QLabel(self._placeholder_assignment_title)
-    #     self._assignment_label.setFont(bold_font)
-    #     self._due_date_label = QLabel("")
-    #     self._score_label = QLabel("")
-    #     self._info_grid = self._setup_info_grid()
-    #     make_truncatable(self._assignment_label)
-    #     self._viewer = ResourceRichBrowser(resource_manager)
-    #     self.setLayout(self._setup_layout())
-    #     self._assignment_tree.assignment_selected.connect(self._assignment_selected)
-    #     self._assignment_tree.reexpand()
-    #
-    # def _setup_info_grid(self) -> QWidget:
-    #     layout = grid_layout(
-    #         [
-    #             [
-    #                 _bold_label("Due:"),
-    #                 self._due_date_label,
-    #             ],
-    #             [
-    #                 _bold_label("Score:"),
-    #                 self._score_label,
-    #             ],
-    #         ]
-    #     )
-    #     layout.setColumnStretch(0, 0)
-    #     layout.setColumnStretch(1, 1)
-    #
-    #     widget = QWidget()
-    #     widget.setLayout(layout)
-    #
-    #     return widget
-    #
-    # def _setup_layout(self) -> QHBoxLayout:
-    #     h_box = QHBoxLayout()
-    #     h_box.addWidget(self._assignment_tree, 1)
-    #     h_box.addLayout(
-    #         layout(QVBoxLayout, self._assignment_label, self._info_grid, self._viewer),
-    #         2,
-    #     )
-    #
-    #     return h_box
-    #
-    # def reload(self, course: db.Course, *, sync_receipt: Optional[SyncReceipt]) -> None:
-    #     self._assignment_tree.reload(course, sync_receipt=sync_receipt)
-    #
-    # @Slot()
-    # def _assignment_selected(self, assignment: db.Assignment) -> None:
-    #     if assignment is not None:
-    #         _logger.debug(
-    #             "Show assignment %s (id='%s')", assignment.name, assignment.id
-    #         )
-    #         self._viewer.show_content(assignment)
-    #         self._update_info(assignment)
-    #     else:
-    #         self._assignment_label.setText(self._placeholder_assignment_title)
-    #         self._show_blank()
-    #
-    # def _update_info(self, assignment: db.Assignment) -> None:
-    #     _logger.debug(assignment.course.name)
-    #     _logger.debug("Due %s", assignment.due_date)
-    #     _logger.debug("Score %s/%s", assignment.mark, assignment.max_mark_possible)
-    #     self._assignment_label.setText(assignment.name)
-    #
-    #     if assignment.due_date is not None:
-    #         self._due_date_label.setText(
-    #             assignment.due_date.strftime("%A %Y-%m-%d %H:%M:%S")
-    #         )
-    #     else:
-    #         self._due_date_label.setText("?")
-    #     self._score_label.setText(
-    #         f"{assignment.mark or '?'}/{assignment.max_mark_possible or '?'}"
-    #     )
-    #
-    # def _show_blank(self) -> None:
-    #     self._viewer.show_blank()
-    #     self._info_grid.hide()

qcanvas-1.0.9.dev1/qcanvas/util/fe_resource_manager.py

@@ -1,23 +0,0 @@
-import logging
-
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-
-_logger = logging.getLogger(__name__)
-
-
-# todo stub for now
-class _RM(ResourceManager):
-    def on_download_progress(self, resource: db.Resource, current: int, total: int):
-        if total == 0 and current == 0:
-            _logger.info(f"download of {resource.file_name}: ?%")
-        else:
-            _logger.info(
-                f"download of {resource.file_name}: {(current / total) * 100}%"
-            )
-
-    def on_download_failed(self, resource: db.Resource):
-        _logger.info(f"download of {resource.file_name} failed")
-
-    def on_download_finished(self, resource: db.Resource):
-        _logger.info(f"download of {resource.file_name} finished")