qcanvas 0.0.5.2a0__py3-none-any.whl → 0.0.5.4a0__py3-none-any.whl

qcanvas/__main__.py

@@ -22,9 +22,9 @@ from qcanvas.util.app_settings import settings
 from qcanvas.util.constants import app_name, updated_and_needs_restart_return_code
 from qcanvas.util.course_indexer import DataManager
 from qcanvas.util.helpers import theme_helper
-from qcanvas.util.linkscanner import CanvasFileScanner
-from qcanvas.util.linkscanner.canvas_media_object_scanner import CanvasMediaObjectScanner
-from qcanvas.util.linkscanner.dropbox_scanner import DropboxScanner
+from qcanvas.util.link_scanner import CanvasFileScanner
+from qcanvas.util.link_scanner.canvas_media_object_scanner import CanvasMediaObjectScanner
+from qcanvas.util.link_scanner.dropbox_scanner import DropboxScanner
 
 engine = create_async_engine("sqlite+aiosqlite:///canvas_db.😘", echo=False)
 
@@ -58,8 +58,9 @@ class LoaderWindow(QMainWindow):
     @asyncSlot()
     async def on_init(self) -> None:
         try:
+            all_set = None not in [settings.api_key, settings.canvas_url, settings.panopto_url]
             # Verify that the canvas urls and api key are valid
-            if not await CanvasClient.verify_config(settings.canvas_url, settings.api_key):
+            if not all_set or not await CanvasClient.verify_config(settings.canvas_url, settings.api_key):
                 # Show the setup dialog
                 self.setup.emit()
             else:

qcanvas/net/canvas/canvas_client.py

@@ -1,7 +1,7 @@
 import asyncio
 import json
 import logging
-from typing import BinaryIO, AsyncIterator
+from typing import BinaryIO, AsyncIterator, Any
 
 import gql
 import httpx
@@ -13,7 +13,7 @@ from tenacity import retry, wait_exponential, wait_random, stop_after_attempt, w
 import qcanvas.db as db
 from qcanvas.net.canvas.legacy_canvas_types import LegacyFile, LegacyPage
 from qcanvas.net.custom_httpx_async_transport import CustomHTTPXAsyncTransport
-from qcanvas.net.self_authenticating import SelfAuthenticating, AuthenticationException
+from qcanvas.net.self_authenticating import SelfAuthenticatingWithHttpClient, AuthenticationException
 
 
 class RatelimitedException(Exception):
@@ -48,11 +48,7 @@ def detect_ratelimit_and_raise(response: Response) -> Response:
     return response
 
 
-def detect_authentication_needed(response: Response):
-    return response.url.path == "/login/canvas" or response.status_code == 401
-
-
-class CanvasClient(SelfAuthenticating):
+class CanvasClient(SelfAuthenticatingWithHttpClient):
     _logger = logging.getLogger("canvas_client")
     _net_op_sem = asyncio.Semaphore(20)
 
@@ -73,11 +69,9 @@ class CanvasClient(SelfAuthenticating):
         return response.is_success
 
     def __init__(self, canvas_url: URL, api_key: str, client: httpx.AsyncClient | None = None):
-        super().__init__()
+        super().__init__(client=client or httpx.AsyncClient(timeout=60))
         self.api_key = api_key
         self.canvas_url = canvas_url
-        self.client = client or httpx.AsyncClient(timeout=60)
-        self.max_retries = 3
 
     def get_headers(self) -> dict[str, dict]:
         return {"headers": {"Authorization": f"Bearer {self.api_key}"}}
@@ -158,13 +152,7 @@ class CanvasClient(SelfAuthenticating):
         wait=wait_fixed(5) + wait_random(0, 1),
         retry=retry_if_exception_type(TransportQueryError)
     )
-    async def do_graphql_query(self, query: gql.client.DocumentNode, **kwargs):
-        """
-        Executes a graphql query and reauthenticates the client if needed
-        :param query:
-        :param operation: The operation to execute
-        :return: The result
-        """
+    async def do_graphql_query(self, query: gql.client.DocumentNode, **kwargs) -> dict[str, Any]:
         async with self._net_op_sem:
             gql_transport = CustomHTTPXAsyncTransport(self.client, self.canvas_url.join("api/graphql"),
                                                       **self.get_headers())
@@ -193,36 +181,13 @@ class CanvasClient(SelfAuthenticating):
         self._logger.warning("Gave up download of %s", resource.url)
         raise
 
-    async def do_request_and_retry_if_unauthenticated(self, url: URL):
-        """
-        Executes a http request or reauthenticate and retries if needed
-        :param url: The url of the request
-        :return:
-        """
-        retries = 0
-
-        # Make the initial request
-        response = await self.client.get(url, **self.get_headers())
-
-        # Retry if canvas is trying to get us to reauthenticate
-        while (await self.reauthenticate_if_needed(response)) and retries < self.max_retries:
-            response = await self.client.get(url, **self.get_headers())
-            retries += 1
-
-        return response.text
-
-    async def reauthenticate_if_needed(self, response: Response):
-        """
-        Inspects a response and activates reauthentication if the response indicates we need to
-        :param response: The response to inspect
-        :return: True if reauthentication was activated, false if not
-        """
-
-        if detect_authentication_needed(response):
-            await self.reauthenticate()
-            return True
+    async def do_request_and_retry_if_unauthenticated(self, url: URL, method: str, **kwargs) -> httpx.Response:
+        # Add API token to the request
+        return await super().do_request_and_retry_if_unauthenticated(url, method, **kwargs, **self.get_headers())
 
-        return False
+    def detect_authentication_needed(self, response: Response):
+        # Canvas will silently redirect to the login page or give a 401 if we are not authenticated
+        return response.url.path == "/login/canvas" or response.status_code == 401
 
     async def _authenticate(self):
         token_response = await self.client.get(self.canvas_url.join("login/session_token"), **self.get_headers())

qcanvas/net/self_authenticating.py

@@ -1,6 +1,10 @@
 import logging
+from abc import ABC, abstractmethod
 from asyncio import Lock, Event
 
+import httpx
+from httpx import URL
+
 
 class AuthenticationException(Exception):
     pass
@@ -9,14 +13,16 @@ class AuthenticationException(Exception):
 # httpx does have an authentication flow mechanism that allows you to also make other requests but I don't know if it
 # will behave the same way as this does. I also finished this before I found out that existed.
 
-class SelfAuthenticating:
+class SelfAuthenticatingWithHttpClient(ABC):
     _logger = logging.getLogger(__name__)
 
-    def __init__(self):
+    def __init__(self, max_retires: int = 3, client: httpx.AsyncClient = httpx.AsyncClient()):
         self.authentication_lock = Lock()
+        self.client = client
         self.authentication_in_progress: Event | None = None
+        self.max_retries = max_retires
 
-    async def reauthenticate(self):
+    async def reauthenticate(self) -> None:
         """
         Re-authenticates the client
         """
@@ -55,8 +61,48 @@ class SelfAuthenticating:
             await event.wait()
             self._logger.info(f"Finished waiting for {self.__class__.__name__}")
 
+    async def do_request_and_retry_if_unauthenticated(self, url: URL, method: str, **kwargs) -> httpx.Response:
+        """
+        Executes a http request or reauthenticate and retries if needed
+        :param url: The url of the request
+        :param method: The method the request should use (post, get, etc)
+        :return:
+        """
+        retries = 0
+
+        async def make_request():
+            return await self.client.request(url=url, method=method, **kwargs)
+
+        # Make the initial request
+        response = await make_request()
+
+        # Retry if canvas is trying to get us to reauthenticate
+        while (await self.reauthenticate_if_needed(response)) and retries < self.max_retries:
+            response = await make_request()
+            retries += 1
+
+        return response
+
+    async def reauthenticate_if_needed(self, response: httpx.Response) -> bool:
+        """
+        Inspects a response and activates reauthentication if the response indicates we need to
+        :param response: The response to inspect
+        :return: True if reauthentication was activated, false if not
+        """
+
+        if self.detect_authentication_needed(response):
+            await self.reauthenticate()
+            return True
+
+        return False
+
+    @abstractmethod
+    def detect_authentication_needed(self, response: httpx.Response) -> bool:
+        ...
+
+    @abstractmethod
     async def _authenticate(self) -> None:
         """
         Authenticates the client
         """
-        raise NotImplemented
+        ...

qcanvas/ui/main_ui.py

@@ -128,7 +128,11 @@ class AppMainWindow(QMainWindow):
 
     @asyncSlot()
     async def open_quick_auth_in_browser(self):
+        opening_progress_dialog = QProgressDialog("Opening canvas", None, 0, 0, self)
+        opening_progress_dialog.setWindowTitle("Please wait")
+        opening_progress_dialog.show()
         QDesktopServices.openUrl(await self.data_manager.client.get_temp_session_link())
+        opening_progress_dialog.close()
 
     def closeEvent(self, event):
         settings.geometry = self.saveGeometry()
@@ -147,6 +151,8 @@ class AppMainWindow(QMainWindow):
 
             await self.data_manager.download_resource(resource)
             QDesktopServices.openUrl(QUrl.fromLocalFile(resource.download_location.absolute()))
+        else:
+            QDesktopServices.openUrl(url)
 
     @asyncSlot(QTreeWidgetItem, int)
     async def download_file_from_file_pane(self, item: QTreeWidgetItem, _: int):
@@ -234,6 +240,8 @@ class AppMainWindow(QMainWindow):
         else:
             self.selected_course = None
             self.file_viewer.clear()
+            self.pages_viewer.clear()
+            self.assignment_viewer.clear()
             self.course_name_label.setText(_no_course_selected_text)
 
     @asyncSlot(db.CoursePreferences)

qcanvas/ui/setup_dialog.py

@@ -51,12 +51,12 @@ class SetupDialog(QDialog):
 
         # Line edits for the different properties
         self.canvas_url = QLineEdit(settings.canvas_url or "")
-        # self.panopto_url = QLineEdit()
+        self.panopto_url = QLineEdit()
         self.canvas_api_key = QLineEdit(settings.api_key or "")
 
         # Add the line edits to the dialog
         self._row("Canvas URL", self.canvas_url)
-        # self._row("Painopto URL", self.panopto_url)
+        self._row("Painopto URL", self.panopto_url)
         self._row("Canvas API key", self.canvas_api_key)
 
         # Add the activity indicator to the dialog
@@ -93,15 +93,15 @@ class SetupDialog(QDialog):
         if self._operation_sem.acquire(False):
             try:
                 canvas_url_text = self.ensure_protocol(self.canvas_url.text().strip())
-                # panopto_url_text = ensure_protocol(self.panopto_url.text().strip())
+                panopto_url_text = self.ensure_protocol(self.panopto_url.text().strip())
                 canvas_api_key_text = self.canvas_api_key.text().strip()
 
                 if not (len(canvas_url_text) > 0 and QUrl(canvas_url_text).isValid()):
                     self._show_invalid_msgbox("Canvas URL")
                     return
-                # if not (len(panopto_url_text) > 0 and QUrl(panopto_url_text).isValid()):
-                #     invalid("Panopto URL")
-                #     return
+                if not (len(panopto_url_text) > 0 and QUrl(panopto_url_text).isValid()):
+                    self._show_invalid_msgbox("Panopto URL")
+                    return
                 elif not len(canvas_api_key_text) > 0:
                     self._show_invalid_msgbox("API key")
                 elif not (await self._verify_canvas_config(canvas_url_text, canvas_api_key_text)):
@@ -116,7 +116,7 @@ class SetupDialog(QDialog):
                     # If nothing was wrong, everything should be fine
                     # Save the url and api key
                     settings.canvas_url = canvas_url_text
-                    # settings.panoptp_url = panopto_url_text
+                    settings.panopto_url = panopto_url_text
                     settings.api_key = canvas_api_key_text
 
                     self.accept()

qcanvas/ui/status_bar_reporter.py

@@ -34,4 +34,7 @@ class StatusBarReporter(ProgressReporter):
         self.status_bar.showMessage("Finished", 5000)
 
     def errored(self, context: Any) -> None:
-        pass
+        if self.status_bar.parent() is not None:
+            self.status_bar.removeWidget(self.progress_bar)
+            self.progress_bar = None
+            self.status_bar.showMessage("Synchronisation error!!", 5000)

qcanvas/ui/viewer/page_list_viewer.py

@@ -11,7 +11,7 @@ from qcanvas.ui.container_item import ContainerItem
 from qcanvas.util.constants import default_assignments_module_names
 from qcanvas.util.course_indexer import resource_helpers
 from qcanvas.util.helpers import canvas_sanitiser
-from qcanvas.util.linkscanner import ResourceScanner
+from qcanvas.util.link_scanner import ResourceScanner
 
 
 class LinkTransformer:
@@ -79,6 +79,11 @@ class PageLikeViewer(QWidget):
         self.model.setHorizontalHeaderLabels([self.header_name])
         self.tree.expandAll()
 
+    def clear(self):
+        self.model.clear()
+        self.viewer.clear()
+        self.model.setHorizontalHeaderLabels([self.header_name])
+
     @abstractmethod
     def _internal_fill_tree(self, data: db.Course):
         ...

qcanvas/util/app_settings.py

@@ -85,6 +85,7 @@ class _AppSettings:
     auxiliary = QSettings("QCanvas", "ui")
 
     canvas_url: MappedSetting[str] = MappedSetting(settings, "canvas_url")
+    panopto_url: MappedSetting[str] = MappedSetting(settings, "panopto_url")
     api_key: MappedSetting[str] = MappedSetting(settings, "api_key")
 
     ignored_update: MappedSetting[Version] = MappedSetting(auxiliary, "ignored_update")

qcanvas/util/course_indexer/data_manager.py

@@ -7,6 +7,7 @@ from typing import Sequence
 
 from gql import gql
 from sqlalchemy import select
+from sqlalchemy.dialects.sqlite import insert as sqlite_upsert
 from sqlalchemy.ext.asyncio.session import async_sessionmaker as AsyncSessionMaker, AsyncSession
 from sqlalchemy.orm import selectin_polymorphic, selectinload
 
@@ -16,8 +17,8 @@ import qcanvas.util.course_indexer.conversion_helpers as conv_helper
 import qcanvas.util.course_indexer.resource_helpers as resource_helper
 from qcanvas.net.canvas import CanvasClient
 from qcanvas.util.download_pool import DownloadPool
-from qcanvas.util.linkscanner.canvas_link_scanner import canvas_resource_id_prefix
-from qcanvas.util.linkscanner.resource_scanner import ResourceScanner
+from qcanvas.util.link_scanner.canvas_link_scanner import canvas_resource_id_prefix
+from qcanvas.util.link_scanner.resource_scanner import ResourceScanner
 from qcanvas.util.progress_reporter import ProgressReporter, noop_reporter
 from qcanvas.util.task_pool import TaskPool
 
@@ -201,28 +202,32 @@ class DataManager:
         if not self._init_called:
             raise Exception("Init was not called")
 
-        async with self._session_maker.begin() as session:
-            # Load module pages/files for the courses
-            await self._load_module_items(g_courses, session, progress_reporter)
+        try:
+            async with self._session_maker.begin() as session:
+                # Load module pages/files for the courses
+                await self._load_module_items(g_courses, session, progress_reporter)
 
-            # Collect assignments from the courses
-            assignments = []
+                # Collect assignments from the courses
+                assignments = []
 
-            for g_course in g_courses:
-                # Create needed data in the session
-                term = await conv_helper.create_term(g_course, session)
-                await conv_helper.create_course(g_course, session, term)
-                await conv_helper.create_modules(g_course, session)
+                for g_course in g_courses:
+                    # Create needed data in the session
+                    term = await conv_helper.create_term(g_course, session)
+                    await conv_helper.create_course(g_course, session, term)
+                    await conv_helper.create_modules(g_course, session)
 
-                # Add course assignments to the list
-                assignments.extend(await conv_helper.create_assignments(g_course, session))
+                    # Add course assignments to the list
+                    assignments.extend(await conv_helper.create_assignments(g_course, session))
 
-            # Scan assignments for resources
-            await self._scan_assignments_for_resources(assignments, session, progress_reporter)
+                # Scan assignments for resources
+                await self._scan_assignments_for_resources(assignments, session, progress_reporter)
 
-            # Add all resources back into the session
-            session.add_all(self._resource_pool.results())
-            progress_reporter.finished()
+                # Add all resources back into the session
+                session.add_all(self._resource_pool.results())
+                progress_reporter.finished()
+        except BaseException as e:
+            traceback.print_exc()
+            progress_reporter.errored(e)
 
     async def _scan_assignments_for_resources(self, assignments: Sequence[db.Assignment], session: AsyncSession,
                                               progress_reporter: ProgressReporter):
@@ -256,8 +261,13 @@ class DataManager:
 
         # Filter out pages that don't need updating
         pages_to_update = _prepare_out_of_date_pages_for_loading(g_courses, existing_pages)
+
+        if len(pages_to_update) == 0:
+            return
+
         # Load the content for all the pages that need updating
-        module_items = await self._load_content_for_pages(pages_to_update, progress_reporter)
+        module_items: list[db.ModuleItem] = await self._load_content_for_pages(pages_to_update, progress_reporter)
+        module_pages = [item for item in module_items if isinstance(item, db.ModulePage)]
 
         # Link the resources found to the pages they were found on and add them to the database
         await resource_helper.create_module_item_resource_relations(
@@ -267,13 +277,43 @@ class DataManager:
                 resource_pool=self._resource_pool,
                 progress_reporter=progress_reporter,
                 # Collect just the module pages for scanning
-                items=[item for item in module_items if isinstance(item, db.ModulePage)]
+                items=module_pages
             ),
             session
         )
 
-        # Add all the module items to the session
-        session.add_all(module_items)
+        # empty inserts/upserts causes an sql error. don't do them
+        if len(module_pages) > 0:
+            # Add all the module items to the session
+            # shitty bandaid fix
+            upsert_item = sqlite_upsert(db.ModuleItem).values([self.moduleitem_dict(item) for item in module_pages])
+            upsert_item = upsert_item.on_conflict_do_update(
+                index_elements=[db.ModuleItem.id],
+                set_=dict(name=upsert_item.excluded.name, updated_at=upsert_item.excluded.updated_at,
+                          position=upsert_item.excluded.position),
+
+            )
+
+            upsert_page = sqlite_upsert(db.ModulePage).values([self.page_dict(item) for item in module_pages])
+            upsert_page = upsert_page.on_conflict_do_update(
+                index_elements=[db.ModulePage.id],
+                set_=dict(content=upsert_page.excluded.content)
+            )
+
+            await session.execute(upsert_item)
+            await session.execute(upsert_page)
+
+        session.add_all([item for item in module_items if isinstance(item, db.ModuleFile)])
+
+    @staticmethod
+    def page_dict(page: db.ModulePage) -> dict[str, object]:
+        return {"id": page.id, "content": page.content}
+
+    @staticmethod
+    def moduleitem_dict(page: db.ModuleItem) -> dict[str, object]:
+        return {"id": page.id, "name": page.name, "updated_at": page.updated_at, "position": page.position,
+                "module_id": page.module_id, "course_id": page.course_id, "type": page.type,
+                "created_at": page.created_at}
 
     def _add_resources_and_pages_to_taskpool(self, existing_pages: Sequence[db.ModuleItem],
                                              existing_resources: Sequence[db.Resource]):
@@ -293,6 +333,7 @@ class DataManager:
             The pages to load
         Returns
         -------
+        list
             The list of complete pages with page content loaded.
         """
         progress = progress_reporter.section("Loading page content", len(pages))

qcanvas/util/course_indexer/resource_helpers.py

@@ -7,11 +7,11 @@ from bs4 import Tag, BeautifulSoup
 from sqlalchemy.ext.asyncio import AsyncSession
 
 import qcanvas.db as db
-from qcanvas.util.linkscanner import ResourceScanner
+from qcanvas.util.link_scanner import ResourceScanner
 from qcanvas.util.progress_reporter import ProgressReporter
 from qcanvas.util.task_pool import TaskPool
 
-_logger = logging.getLogger()
+_logger = logging.getLogger(__name__)
 
 resource_elements = ["a", "iframe", "img"]
 
@@ -63,6 +63,7 @@ async def create_assignment_resource_relations(relations: Sequence[TransientReso
             )
 
 
+# todo change resource system to think of resources as links on a page with a shallow id (that may be the same as the deep id) which links to one or more deep ids
 async def find_resources_in_pages(link_scanners: Sequence[ResourceScanner], resource_pool: TaskPool[db.Resource],
                                   items: Sequence[db.PageLike], progress_reporter: ProgressReporter) -> list[
     TransientResourceToPageLink]:

qcanvas/util/{linkscanner → link_scanner}/canvas_link_scanner.py

@@ -3,7 +3,7 @@ from httpx import URL
 
 from qcanvas import db as db
 from qcanvas.net.canvas import CanvasClient
-from qcanvas.util.linkscanner.resource_scanner import ResourceScanner
+from qcanvas.util.link_scanner.resource_scanner import ResourceScanner
 
 canvas_resource_id_prefix = "canvas_file"
 

qcanvas/util/{linkscanner → link_scanner}/canvas_media_object_scanner.py

@@ -5,7 +5,7 @@ from bs4 import Tag, BeautifulSoup
 from httpx import AsyncClient
 
 from qcanvas import db as db
-from qcanvas.util.linkscanner import ResourceScanner
+from qcanvas.util.link_scanner import ResourceScanner
 
 
 class CanvasMediaObjectScanner(ResourceScanner):

qcanvas/util/{linkscanner → link_scanner}/dropbox_scanner.py

@@ -3,7 +3,7 @@ from bs4 import Tag
 from httpx import URL
 
 from qcanvas import db as db
-from qcanvas.util.linkscanner import ResourceScanner
+from qcanvas.util.link_scanner import ResourceScanner
 
 
 # from httpx import URL

qcanvas/util/task_pool.py

@@ -225,9 +225,9 @@ class TaskPool(Generic[T]):
 
         return list(filter(filter_func, self._results.values()))
 
-    def get_completed_result(self, task_id: object) -> T | None:
+    def get_completed_result_or_nothing(self, task_id: object, default: T | None = None) -> T | None:
         """
-        Returns the result of an already completed task
+        Returns the result of an already completed task, or nothing at all if result with that id exists or is still in progress
 
         Returns
         -------
@@ -246,8 +246,8 @@ class TaskPool(Generic[T]):
             result = self._results[task_id]
 
             if isinstance(result, asyncio.Event):
-                raise ValueError(f"{task_id} is still in progress")
+                return None
 
             return result
         else:
-            raise KeyError(f"{task_id} has not been started")
+            return None

{qcanvas-0.0.5.2a0.dist-info → qcanvas-0.0.5.4a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 0.0.5.2a0
+Version: 0.0.5.4a0
 Summary: A canvas client
 Author: QCanvas
 Classifier: Operating System :: OS Independent
@@ -8,7 +8,6 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: <=3.12,>=3.11
 Requires-Dist: aiosqlite-custom~=0.19.0
 Requires-Dist: beautifulsoup4~=4.12.3
-Requires-Dist: bs4~=0.0.1
 Requires-Dist: gql~=3.6.0b0
 Requires-Dist: httpx~=0.26.0
 Requires-Dist: packaging~=23.2

{qcanvas-0.0.5.2a0.dist-info → qcanvas-0.0.5.4a0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 qcanvas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qcanvas/__main__.py,sha256=7a0-bsPIZ7XYEUZNFAGdsVLkyI1j93vC-E_9r_rpvqU,5157
+qcanvas/__main__.py,sha256=zXR8JG5PpiupENn-D5oK3l6dUCuIZKVVAx2JSxy6Lok,5271
 qcanvas/db/__init__.py,sha256=j5ZiTiLuY0CYRUV2bktc8qE5x-jBNaSaSVNKAF8DKF0,420
 qcanvas/db/database.py,sha256=pz3wZ2QwxalSruV-5vID3QDImbX9AD-rkGXRqiaIPmw,10515
 qcanvas/db/db_converter_helper.py,sha256=-Rpe4CvMJBmvYXLw68caJWwEMPvxsYJB800Z8vHyqX4,2169
@@ -9,9 +9,9 @@ qcanvas/icons/main_icon.svg,sha256=26moo6Ki_YSkazCgOZgs4pi2p4qWNLDIWugwLMfAWfs,1
 qcanvas/icons/rc_icons.py,sha256=F8TS5WzBbKdNOm3uARzOU0O2ODpOlh4OPIddp1B-1P4,10896
 qcanvas/net/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/net/custom_httpx_async_transport.py,sha256=1OyszJO8TrwDrq-no-angb-AIjgq_GiV67tQHuPxmm0,1227
-qcanvas/net/self_authenticating.py,sha256=bF0lq9BgDQg5We4l0Z_JpJhI8ZGC7TTgggMWHUOYw3U,2515
+qcanvas/net/self_authenticating.py,sha256=VkWpp7kxaWQHvqMjW9Dw-oY0aNFOT-6SYkJMnSvCdqU,4136
 qcanvas/net/canvas/__init__.py,sha256=EPLFN05Vx9yNHDLK-eUp97C6ymtMTnscwdn28OBlNJw,96
-qcanvas/net/canvas/canvas_client.py,sha256=eENktdmVnyd6eIh6I4dH-5mU09pfJLo-v1xQ8Oma26k,9674
+qcanvas/net/canvas/canvas_client.py,sha256=yxhk3uxjkZFXkp-99Jmr7_GDqpa5OBtNBpQU6zQSGuc,8778
 qcanvas/net/canvas/legacy_canvas_types.py,sha256=pKuTBh1m5oSq9e7jmbHzYfKeoPSw0uHAqLwddKZpsr4,3942
 qcanvas/queries/__init__.py,sha256=tRUwMS1OvYIWRd4WpmAHrDrcelj_dLEaesxh9NngC6s,227
 qcanvas/queries/all_courses.gql,sha256=8U0_3VOcD66SRCfvhZ9IOTmxVgDPJdMD_LuGPbM9vVU,124
@@ -20,9 +20,9 @@ qcanvas/queries/canvas_course_data.gql,sha256=KJHjdu5sMKld4L6mPGfUrhqRLx_wdgGH8f
 qcanvas/queries/canvas_course_data.py,sha256=_ZNv9stXAyap2eBbCqmajXVpWr0920ZUcCS6Gtyyo0g,4314
 qcanvas/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/ui/container_item.py,sha256=MNGL3Z6dNlM59XXWqmXB1Ql3FTOEdA6TY2K9Do1LmTE,285
-qcanvas/ui/main_ui.py,sha256=2vpBJ_5DZit8ZYo-fIWk7x9zRarVwO-zu1cnXm5QMMc,9824
-qcanvas/ui/setup_dialog.py,sha256=BXDNDd5IjA0l-9teUYsOCYMRXxUl4Ryxx64GsxJX5xU,7261
-qcanvas/ui/status_bar_reporter.py,sha256=6Qp0i-vUq9Yxowx0BSB4ieR8BO37iKjRNvPQ1AHUXtI,1318
+qcanvas/ui/main_ui.py,sha256=S6lQ_kqwunQcByCOMZbp2HQu5RjmQjwMeMAnIZebjoA,10188
+qcanvas/ui/setup_dialog.py,sha256=Rh9Zj595-OdPUN31cN8QcY5V2giQ3zPRUg65t6wQ-LY,7270
+qcanvas/ui/status_bar_reporter.py,sha256=uLX_C8r0augOSOwS-HCeDFxuSQKUJ8qYM5RE8kTKklU,1524
 qcanvas/ui/menu_bar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/ui/menu_bar/grouping_preferences_menu.py,sha256=nSe9qt3pI9WAiKVTOEtHN9JPW3gaDxpU8YiSGGRjR5M,2407
 qcanvas/ui/menu_bar/theme_selection_menu.py,sha256=WdcFMEO-FRYJm3qKjYbUpRhJPVe0-RhwrVxcyckSr0Q,1248
@@ -30,32 +30,32 @@ qcanvas/ui/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 qcanvas/ui/viewer/course_list.py,sha256=jg_t66uyZpWyBITRWBFHaYgYMvWJ5useMljWv4tfOx4,3413
 qcanvas/ui/viewer/file_list.py,sha256=hqKXrLs4bLHA9himFEuE8d8Pq2TJnvuUGGJgZftiyrA,7869
 qcanvas/ui/viewer/file_view_tab.py,sha256=DrXwHwIPBoHVjsKU3zUbOvA4tTarp29d4cMYvZnE-O8,2205
-qcanvas/ui/viewer/page_list_viewer.py,sha256=-5wtDEX6TMSMNYyCxWAyf2nIBuIEPSgcmSaiDNcWQrQ,5535
+qcanvas/ui/viewer/page_list_viewer.py,sha256=FKFuqgy_yQPS_i3c0AbQk5E3mxtOfgYI7Q81mD28bLI,5678
 qcanvas/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qcanvas/util/app_settings.py,sha256=B9hIfl6wQZkBflM1_UwpCEd935k7sckegXXwKMbSnYo,2940
+qcanvas/util/app_settings.py,sha256=G_aq-7FPXmV4pN0cM2VldFS1HwTIzofgezgXt0y-AQ0,3017
 qcanvas/util/constants.py,sha256=GNRlqG9rnWlW5ijKoJEsyuOWTdrXNSiWL_a5XeEZzI0,259
 qcanvas/util/download_pool.py,sha256=8MRzdxZMmCibMx1rwh0G8U2SPjITtvDieLyr8drhJ7c,2003
 qcanvas/util/progress_reporter.py,sha256=wgD8A_mrZ3EZQtrJeCYoQ0TvMIVtdFKDVNTQrbZMoDA,2934
 qcanvas/util/self_updater.py,sha256=oItk-J-CSN74RGu4P_xtJ4S8vGnaAZL23Bm4jpLbLzg,1655
-qcanvas/util/task_pool.py,sha256=kizChooliF7O9w5LtgBd87LHT_M1aGXiPoJ-M8Lg2RY,8159
+qcanvas/util/task_pool.py,sha256=NHrsgY8Srd4I9Iv3qqGLblF2RRqLqbLcYFgvnEGpvaY,8192
 qcanvas/util/course_indexer/__init__.py,sha256=IqwTfB8KVk7Go_yuBL8NOANgFiBCzjt0z38D4CEgq7w,38
 qcanvas/util/course_indexer/conversion_helpers.py,sha256=DZwx3Ct-MYzxQwuvqem5c2cARSkr_2SJvz0gaZDJq6c,2644
-qcanvas/util/course_indexer/data_manager.py,sha256=AsDP-PLzFquL-d0l9uFyAihcfLbRGuCYoQV4uySk_uE,17045
-qcanvas/util/course_indexer/resource_helpers.py,sha256=54XnTbcq8RG1zSDifycSYdpQ007_aQrFFXkibMO7l8k,6794
+qcanvas/util/course_indexer/data_manager.py,sha256=qqcrd5OnZqygpINxVDSJ-AkxOoCDgEiTdZ6w8-oNlNM,18903
+qcanvas/util/course_indexer/resource_helpers.py,sha256=htd3XnrnOEkS8iAxTqAIypgMzqJEcjs1Qte9wmF2ccQ,6966
 qcanvas/util/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/util/helpers/canvas_sanitiser.py,sha256=c6r6cyJomQ1zn5wFK-LX-ZsZXQZ-A2awBFtCB_JqUtE,1184
 qcanvas/util/helpers/file_icon_helper.py,sha256=6Rgy5K5wB6Hofsx4Etu6JlurAJEqma32zOLWgRHTf48,925
 qcanvas/util/helpers/qaction_helper.py,sha256=lQ3eouIgR3w3o1jLNAmu2plAdc6HBBT5qaE4cnW6cX8,667
 qcanvas/util/helpers/theme_helper.py,sha256=5rvKdYwmPMWDlSWuRBpEcixyq_iBeKDoEfvmiy5ZbLQ,1210
-qcanvas/util/linkscanner/__init__.py,sha256=VVZ4L0AwC-TQtX6JQNUcpWH8UhKaCaSS3_7X4i3mipE,97
-qcanvas/util/linkscanner/canvas_link_scanner.py,sha256=mRvahbf_sClGTflc9nFKEbi5HltbIfWZu2qE-IhJO2o,1450
-qcanvas/util/linkscanner/canvas_media_object_scanner.py,sha256=0PL0buW53YQaOlT-n-UazwHFQS91ivfJN5kiw6tcfa4,2218
-qcanvas/util/linkscanner/dropbox_scanner.py,sha256=HB7FhZp3dQwvq1Ptkug7NEJu5yS4UEd4Xy19EZUIZ7k,2033
-qcanvas/util/linkscanner/resource_scanner.py,sha256=EY5AzDXG6Ix18YpRkJcMjOPaygird6iD1akaG-yUyHc,1988
+qcanvas/util/link_scanner/__init__.py,sha256=VVZ4L0AwC-TQtX6JQNUcpWH8UhKaCaSS3_7X4i3mipE,97
+qcanvas/util/link_scanner/canvas_link_scanner.py,sha256=M7_zc7AU2pI9RdR8AaC9cyEiNufnu6bNxu4qu7FaLns,1451
+qcanvas/util/link_scanner/canvas_media_object_scanner.py,sha256=8xnDtrdqxIzW-8JuoKXGUoB2usR6S8rzma_QB6rGzaI,2219
+qcanvas/util/link_scanner/dropbox_scanner.py,sha256=_xIOGpPH5voORGPGLCEXcQCWWf-PVSBg8MEm-hcIs3M,2034
+qcanvas/util/link_scanner/resource_scanner.py,sha256=EY5AzDXG6Ix18YpRkJcMjOPaygird6iD1akaG-yUyHc,1988
 qcanvas/util/tree_util/__init__.py,sha256=yqjNHrD8SiyW_fGPfw7xdS-Rctjdu-RMWSkUxcGSn8k,154
 qcanvas/util/tree_util/expanding_tree.py,sha256=5UM9kfcHtVavzAc9nwd7lucVnjI_dkVH8qC3GvmBvtc,6622
 qcanvas/util/tree_util/model_helpers.py,sha256=io1bHOMNgVqkPvGH2Iohug1-wx2MwC_-qlWlpVA0fFE,743
 qcanvas/util/tree_util/tree_model.py,sha256=JhlYmGqxlul8jUUQ-KtPXIehzgG-UtszHve7Wh-XbtE,2981
-qcanvas-0.0.5.2a0.dist-info/METADATA,sha256=sYVc14zPHkIRzrCAslhOP8ABZspmiU-ciMj4sAskgQ4,676
-qcanvas-0.0.5.2a0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-qcanvas-0.0.5.2a0.dist-info/RECORD,,
+qcanvas-0.0.5.4a0.dist-info/METADATA,sha256=Fjv5DyBlWKM2P_rQhrJkLUojcKrnQUyvup_TpaYdOdU,650
+qcanvas-0.0.5.4a0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+qcanvas-0.0.5.4a0.dist-info/RECORD,,