qcanvas 0.0.5.7a0__py3-none-any.whl → 1.0.3.post0__py3-none-any.whl

qcanvas-1.0.3.post0.dist-info/RECORD

@@ -0,0 +1,64 @@
+qcanvas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qcanvas/app_start/__init__.py,sha256=eY5J0QuKCx0keX443qA4Fgs6paojxwPOWdD66pBVQ7Q,1078
+qcanvas/backend_connectors/__init__.py,sha256=Wj8cmxQng3SSlmlXJyzHaPmvxbkauwsxINckPb7WuHc,108
+qcanvas/backend_connectors/frontend_resource_manager.py,sha256=EpwsVzA4b6M9y5twn9cG_GujwzwmKxBfdgqPCQ8tB3I,2131
+qcanvas/backend_connectors/qcanvas_task_master.py,sha256=SAZ_7dWsQr35cdkhcbIlkxWbe3C46_vLNThOpvTHIOs,751
+qcanvas/icons/__init__.py,sha256=eaZWyt-xEsLqRVI2HNvevgRhXUnM_oyDrT5hSyLM1eE,246
+qcanvas/icons/file-download-failed.svg,sha256=b1Nx5mW_dbh3nuex4e-11btcGILLg59PHUG5lV6bc2U,1327
+qcanvas/icons/file-downloaded.svg,sha256=ymf1NU5uvKZq41kNVTtKkUoIzUE3pbHmx5IvwPYoyiU,789
+qcanvas/icons/file-not-downloaded.svg,sha256=TVpIZYDUfOw3S0cmXR3FawiCp0Y_PTSR4XKwrsy1qOs,1270
+qcanvas/icons/file-unknown.svg,sha256=9xlN244HJX3zM_MqdMTnNbKlqLjOFgCx3ZdM4Wc4zC0,1729
+qcanvas/icons/icons.qrc,sha256=czwaoP0TNXGoH91cstRbdhvKnfyLlmAp-VmaZoBk0YY,280
+qcanvas/icons/main_icon.svg,sha256=st2sfA8HIETmoacJ2Oq84iJzfnNHH-T03ijB-J419_s,16104
+qcanvas/icons/rc_icons.py,sha256=Ankeu0oWJk-1qLGVLxmiK5Kt1LVNyDmpR8jJZzOG5gQ,18194
+qcanvas/icons/sync.svg,sha256=J-7_KnFbQL3uh-RrTy0_wSJUVW4Cc6ZSTacld6ULv1w,2829
+qcanvas/run.py,sha256=V_ni8SWwh4_GrymX09Yfmd8Pwpz30ohIpDQ6Nk6rQPw,538
+qcanvas/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qcanvas/ui/course_viewer/__init__.py,sha256=XkoFnh4ULw3_i-GDsOlueEWido0PkoDcN9_EX6-nkXY,76
+qcanvas/ui/course_viewer/content_tree.py,sha256=-W9-pw76j2SHWoFnhLk7DhQxhge_Kh0HHxHYDYsyBeQ,3605
+qcanvas/ui/course_viewer/course_tree.py,sha256=mp2bzqtd9e8TT5_23leR1p-B1IbZbRu9D8fntAIjY5U,2937
+qcanvas/ui/course_viewer/course_viewer.py,sha256=t2RFzGIq_LM3yNNxY0bcNRg6Z0gFoA1iJPy6OSqvOYs,2457
+qcanvas/ui/course_viewer/tabs/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
+qcanvas/ui/course_viewer/tabs/assignment_tab/__init__.py,sha256=w936dW7za10Fh6rN0zVA-7Kyiup3kd6C-mPAFHtxmy0,42
+qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py,sha256=dt9UtjxDwbmhsVP2dI1uaE2ovPdH7TynR0mkUnOP-so,5630
+qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py,sha256=O1O3-ZPimjm4xPliVSPUmlKdlIwbUc3oehtmeVfiVdU,3412
+qcanvas/ui/course_viewer/tabs/content_tab.py,sha256=gk2r1UBOyMOXeeTs1zBgsHBKc1oAOeIM75RTE3_mkug,3184
+qcanvas/ui/course_viewer/tabs/mail_tab/__init__.py,sha256=68iRUUWEP7mudbaxa4ZBKMra4rvs2oZKaZkBWwmUrsI,30
+qcanvas/ui/course_viewer/tabs/mail_tab/mail_tab.py,sha256=6VwUyHa5IItHzaSikX-P8IqT_AFcvhLycUIcx-5BeO4,2126
+qcanvas/ui/course_viewer/tabs/mail_tab/mail_tree.py,sha256=zoWz9iWxNhv9fGxpdXMrF6APvMwD9tyQbngTLJlTIhU,2151
+qcanvas/ui/course_viewer/tabs/page_tab/__init__.py,sha256=lcafxlSEVZ0wqZySxT6hTrvExX-GU2AfcZQbp6W8haU,30
+qcanvas/ui/course_viewer/tabs/page_tab/page_tab.py,sha256=uWLiVjrccF-Xyit_BTfQ2GvytVuURidTIPKyJVCMSGw,1079
+qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py,sha256=-waRh47KZajmme-UT4iEetM-skSW2aMuGPxA1Cjkjqs,2579
+qcanvas/ui/course_viewer/tabs/resource_rich_browser.py,sha256=rVeBKjjgE_aT0B7TgBHoJSy2qrHeVagS58YSEK_zaP8,6240
+qcanvas/ui/course_viewer/tabs/util.py,sha256=rUVEGSREV9vTFs4o3AD2OjaSFA-GPsmelxYWz0J8OP4,48
+qcanvas/ui/main_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qcanvas/ui/main_ui/course_viewer_container.py,sha256=PgqgWoUdP1QoLt1ZSGke6sCLko80FtOIuYrqlIA3ilA,1914
+qcanvas/ui/main_ui/options/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
+qcanvas/ui/main_ui/options/quick_sync_option.py,sha256=qEfmtLllO32ejc-bydCvFRjal5RUlk2HtC5Ld4mT7ss,753
+qcanvas/ui/main_ui/options/sync_on_start_option.py,sha256=zFFAAyGZEa6qBchJJIm7bJpOwxcntnto9Ee-lzCiHX4,731
+qcanvas/ui/main_ui/qcanvas_window.py,sha256=Za2uzvK64mX1-KoHyjK04o3Cf2ckMcIYJjuZ0zndtKQ,6713
+qcanvas/ui/main_ui/status_bar_progress_display.py,sha256=rYvrwG0FAMzUuKiFvnjYv3YSlYQYG-K9MKeAvP5UIzU,4833
+qcanvas/ui/memory_tree/__init__.py,sha256=-XLitM6teC0zmwPrGf-Q-A53-zgmIPASExdOtaLIvPU,107
+qcanvas/ui/memory_tree/_tree_memory.py,sha256=CMKfCnrHj22ervaq7xB5U4AiKijYvghUK5ZL0MJIFmQ,1805
+qcanvas/ui/memory_tree/memory_tree_widget.py,sha256=NOug0yjzX-woSDqv2HK1-HFf6cJxdGeIwebz2QaSB-Q,4402
+qcanvas/ui/memory_tree/memory_tree_widget_item.py,sha256=JXk07AzrKsBnYAqhayIFYAwMfF_D_EfkfJY4Qyez47U,425
+qcanvas/ui/setup/__init__.py,sha256=QWt2lEyLqWG5QC-BmCBlYyi0LZsBfsQYbP0XkvqA2f8,77
+qcanvas/ui/setup/setup_checker.py,sha256=ysQpkVLIWn8BR3hKhekuRIsHNAOU-jnHm061dfQ_OcY,396
+qcanvas/ui/setup/setup_dialog.py,sha256=rl5B3AsNcV-QNeGw3xKnEP87Giyug5hsW8mhU3S8IUM,7881
+qcanvas/util/__init__.py,sha256=RmC5zxGHoTLudrx9uol55fM5dvIkFjBCroQGYXaELCA,51
+qcanvas/util/basic_fonts.py,sha256=1NK5_kejgH45mENwiTWvE5oOuAvGqWMX3hg9tTUCBi4,243
+qcanvas/util/fe_resource_manager.py,sha256=5YO549oBpSgcthD9hxm8trnjHEfudltkh-SfqlOa9xA,808
+qcanvas/util/html_cleaner.py,sha256=O9_PhvZZw3RcPjdXZagAbNmp8Hfyq9fydBH-ee-DfII,615
+qcanvas/util/layouts.py,sha256=7wQ0-DAbRHPPcfVIQoOmVhPdhGqcF-6qWE1-P86e7ys,1351
+qcanvas/util/logs.py,sha256=VZKFITiW2WR2POEFVv5GRpEXic23Pzjehry-vH3g3Gk,138
+qcanvas/util/paths.py,sha256=HGIOqplZykmGBNaUaNFIik_Tj4jLAi4n-TZbvUIivDE,1035
+qcanvas/util/settings/__init__.py,sha256=ivc8bczhQdEJsWse6fc81Xyz0i2YX57pL4UubM3NJfw,228
+qcanvas/util/settings/_client_settings.py,sha256=HxGH9eOCdBj8wYboGhzNX0LFw_bmzF-Vwo44y1W0EqY,1036
+qcanvas/util/settings/_mapped_setting.py,sha256=1zQAfXxWB9yUtWCBObnOZl7EQ22bS-4u2yGGGSdhKJo,1792
+qcanvas/util/settings/_ui_settings.py,sha256=X1AFVIJzck0S3YdEWN6VMws4k9sWquM1t5hwMYOsfTw,927
+qcanvas/util/ui_tools.py,sha256=bSM1xrmZPn847YEbXAC9VIAv--8hMLMWrsEMWGA5p3E,916
+qcanvas/util/url_checker.py,sha256=03jqnQ1_GOlCJyRHrlMbSQE9QsHrVNsg0kFsA8oKP60,361
+qcanvas-1.0.3.post0.dist-info/METADATA,sha256=NoCI4QeObT-imY9XOKjGS87Lc0Mkvg8v6OgRq4h3J54,1643
+qcanvas-1.0.3.post0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+qcanvas-1.0.3.post0.dist-info/entry_points.txt,sha256=46VbnhQ9w2CYdfhYcPfWgjXYHjsKshu0asQ1B_sAMac,44
+qcanvas-1.0.3.post0.dist-info/RECORD,,

{qcanvas-0.0.5.7a0.dist-info → qcanvas-1.0.3.post0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

qcanvas-1.0.3.post0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+qcanvas=qcanvas.run:main
+

qcanvas/__main__.py

@@ -1,155 +0,0 @@
-import asyncio
-import logging
-import sys
-
-import httpx
-from PySide6.QtCore import Signal
-from PySide6.QtGui import QPixmap
-from PySide6.QtWidgets import QApplication, QProgressDialog, QMainWindow
-from httpx import URL
-from qasync import QEventLoop, asyncSlot
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.ext.asyncio.session import async_sessionmaker as AsyncSessionMaker
-
-import qcanvas.db as db
-# noinspection PyUnresolvedReferences
-import qcanvas.icons
-from qcanvas.net.canvas.canvas_client import CanvasClient
-from qcanvas.ui.main_ui import AppMainWindow
-from qcanvas.ui.setup_dialog import SetupDialog
-from qcanvas.util import self_updater
-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.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)
-
-logging.basicConfig()
-logging.getLogger("canvas_client").setLevel(logging.DEBUG)
-
-
-class LoaderWindow(QMainWindow):
-    """
-    Responsible for verifying that the api key and canvas url is valid, then starting the main app.
-    """
-    init = Signal()
-    setup = Signal()
-    ready = Signal()
-
-    def __init__(self):
-        super().__init__()
-        self.main_window: AppMainWindow | None = None
-        self.main_icon = QPixmap(":/main_icon.svg")
-
-        self.init.connect(self.on_init)
-        self.setup.connect(self.on_setup)
-        self.ready.connect(self.on_ready)
-
-        self.setWindowTitle(app_name)
-        self.setWindowIcon(self.main_icon)
-        self.setCentralWidget(QProgressDialog("Verifying config", None, 0, 0))
-
-        self.init.emit()
-
-    @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 all_set:
-                # Show the setup dialog
-                self.setup.emit()
-            else:
-                # Proceed to main app
-                self.ready.emit()
-        except:
-            # If a problem occurred then something is probably invalid
-            self.setup.emit()
-
-    @asyncSlot()
-    async def on_setup(self) -> None:
-        """
-        Shows the setup dialog
-        """
-        setup = SetupDialog(self, allow_cancel=False)
-        setup.setWindowIcon(self.main_icon)
-        setup.rejected.connect(lambda: self.close())
-        setup.accepted.connect(self.on_ready)
-        setup.show()
-
-    @asyncSlot()
-    async def on_ready(self) -> None:
-        """
-        Sets up the canvas client and data manager for the main app
-        """
-        client = CanvasClient(canvas_url=URL(settings.canvas_url), api_key=settings.api_key)
-        data_manager = DataManager(
-            client=client,
-            link_scanners=[
-                CanvasFileScanner(client),
-                DropboxScanner(httpx.AsyncClient()),
-                CanvasMediaObjectScanner(client.client)
-            ],
-            # Don't expire on commit because we need to take objects outside of the session
-            sessionmaker=AsyncSessionMaker(engine, expire_on_commit=False)
-        )
-
-        await data_manager.init()
-        self.close()
-        self.open_main_app(data_manager)
-
-    def open_main_app(self, data_manager: DataManager) -> None:
-        """
-        Starts the main app
-        Parameters
-        ----------
-        data_manager
-            The data manager the app will use
-        """
-
-        self.main_window = AppMainWindow(data_manager)
-        self.main_window.setWindowTitle(app_name)
-        self.main_window.setWindowIcon(self.main_icon)
-        self.main_window.show()
-        # Set the main window as the parent of this window so this window is destroyed when the main window is closed
-        self.setParent(self.main_window)
-
-
-async def setup_db():
-    # Create meta stuff
-    async with engine.begin() as conn:
-        await conn.run_sync(db.Base.metadata.create_all)
-
-
-if __name__ == '__main__':
-    asyncio.run(setup_db())
-
-    app = QApplication(sys.argv)
-
-    # Apply the selected theme to qt
-    theme_helper.apply_selected_theme()
-
-    # Setup event loop for qasync
-    event_loop = QEventLoop()
-    asyncio.set_event_loop(event_loop)
-    app_close_event = asyncio.Event()
-    app.aboutToQuit.connect(app_close_event.set)
-
-    # Start the loader, which verifies the client config and initialises the data manager for the main program
-    loader_window = LoaderWindow()
-    loader_window.show()
-
-    # For qasync
-    with event_loop:
-        event_loop.run_until_complete(app_close_event.wait())
-
-    print("Exiting")
-
-    # Pass the 'restart needed' flag back to the launcher script, which will re-run the program.
-    # See self_updater.do_update
-    if self_updater.restart_flag:
-        sys.exit(updated_and_needs_restart_return_code)

qcanvas/db/__init__.py

@@ -1,5 +0,0 @@
-from .database import Resource, Module, ModuleItem, ModulePage, ModuleFile, ResourceState, Course, Term, \
-    Assignment, Base, PageLike, ResourceToModuleItemAssociation, ResourceToAssignmentAssociation, CoursePreferences, \
-    GroupByPreference
-from .db_converter_helper import convert_course, convert_page, convert_file, convert_legacy_file, \
-    convert_assignment, convert_module, convert_term, convert_file_page

qcanvas/db/database.py

@@ -1,338 +0,0 @@
-import os.path
-import pathlib
-import platform
-import re
-from datetime import datetime
-from enum import Enum
-from typing import List, Optional, MutableSequence
-
-from sqlalchemy import ForeignKey, Text
-from sqlalchemy.ext.asyncio import AsyncAttrs
-from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped, relationship, MappedAsDataclass
-
-import qcanvas.util.tree_util as tree
-
-
-class PageLike:
-    @property
-    def content(self) -> str | None:
-        raise NotImplementedError()
-
-    @property
-    def name(self) -> str:
-        raise NotImplementedError()
-
-    @property
-    def id(self) -> str:
-        raise NotImplementedError()
-
-    @property
-    def resources(self) -> MutableSequence["Resource"]:
-        raise NotImplementedError()
-
-    @property
-    def course_id(self) -> str:
-        raise NotImplementedError()
-
-    @course_id.setter
-    def course_id(self, value: str):
-        raise NotImplementedError()
-
-    @property
-    def updated_at(self) -> datetime:
-        raise NotImplementedError()
-
-
-class Base(AsyncAttrs, DeclarativeBase):
-    pass
-
-
-def default_assignment_module(module: "Module") -> bool:
-    result = module.name.lower() in ["assessments", "assessment"]
-
-    return result
-
-
-class GroupByPreference(Enum):
-    GROUP_BY_PAGES = 0
-    GROUP_BY_MODULES = 1
-
-
-# fixme should this be MappedAsDataclass?
-class CoursePreferences(Base):
-    __tablename__ = "preferences"
-
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-
-    local_name: Mapped[Optional[str]]
-    files_group_by_preference: Mapped["GroupByPreference"] = mapped_column(default=GroupByPreference.GROUP_BY_PAGES)
-
-    course_id: Mapped[str] = mapped_column(ForeignKey("courses.id"))
-    course: Mapped["Course"] = relationship(back_populates="preferences")
-
-
-class Course(MappedAsDataclass, Base, init=False):
-    __tablename__ = "courses"
-
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    term_id: Mapped[str] = mapped_column(ForeignKey("terms.id"))
-    term: Mapped["Term"] = relationship(back_populates="courses")
-
-    preferences: Mapped["CoursePreferences"] = relationship(back_populates="course")
-
-    name: Mapped[str]
-
-    modules: Mapped[List["Module"]] = relationship(back_populates="course")
-    module_items: Mapped[List["ModuleItem"]] = relationship(back_populates="course")
-    assignments: Mapped[List["Assignment"]] = relationship(back_populates="course")
-    resources: Mapped[List["Resource"]] = relationship(back_populates="course")
-
-
-class Term(MappedAsDataclass, Base):
-    """
-    A term object.
-    Each course belongs to a term.
-
-    Attributes
-    ----------
-    name: str
-        Name of the term
-    start_at: Optional[datetime]
-        Date the term starts
-        Will be null for the 'default term'.
-    end_at: Optional[datetime]
-        Date the term ends.
-        Will be null for the 'default term'.
-    courses: list[Course]
-        *Not required in constructor.*
-        List of courses that belong to this term.
-    """
-
-    __tablename__ = "terms"
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    end_at: Mapped[Optional[datetime]]
-    start_at: Mapped[Optional[datetime]]
-    name: Mapped[str]
-
-    courses: Mapped[List["Course"]] = relationship(back_populates="term", cascade="all, delete")
-
-    def __init__(self, id: str, name: str, end_at: Optional[datetime], start_at: Optional[datetime]):
-        super().__init__()
-        self.id = id
-        self.name = name
-        self.end_at = end_at
-        self.start_at = start_at
-
-    def __hash__(self):
-        return hash(self.id) ^ hash(self.end_at) ^ hash(self.start_at) ^ hash(self.name)
-
-
-class Module(MappedAsDataclass, Base, tree.HasText, init=False):
-    __tablename__ = "modules"
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    course_id: Mapped[str] = mapped_column(ForeignKey("courses.id"))
-    course: Mapped["Course"] = relationship(back_populates="modules")
-
-    name: Mapped[str]
-
-    items: Mapped[List["ModuleItem"]] = relationship(back_populates="module", order_by="ModuleItem.position")
-
-    @property
-    def text(self) -> str:
-        return self.name
-
-
-class ResourceToModuleItemAssociation(MappedAsDataclass, Base):
-    __tablename__ = "resource_to_moduleitem"
-    module_item_id: Mapped[str] = mapped_column(ForeignKey("module_items.id"), primary_key=True)
-    resource_id: Mapped[str] = mapped_column(ForeignKey("resources.id"), primary_key=True)
-
-
-class ResourceToAssignmentAssociation(MappedAsDataclass, Base):
-    __tablename__ = "resource_to_assignment"
-    assignment_id: Mapped[str] = mapped_column(ForeignKey("assignments.id"), primary_key=True)
-    resource_id: Mapped[str] = mapped_column(ForeignKey("resources.id"), primary_key=True)
-
-
-class ResourceState(Enum):
-    NOT_DOWNLOADED = 0
-    DOWNLOADED = 1
-    FAILED = 2
-
-    @staticmethod
-    def human_readable(value: "ResourceState"):
-        match value:
-            case ResourceState.NOT_DOWNLOADED:
-                return "Not downloaded"
-            case ResourceState.DOWNLOADED:
-                return "Downloaded"
-            case ResourceState.FAILED:
-                return "Failed"
-
-        raise ValueError(value)
-
-
-class Resource(MappedAsDataclass, Base, tree.HasText):
-    __tablename__ = "resources"
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    course_id: Mapped[str] = mapped_column(ForeignKey("courses.id"))
-    course: Mapped["Course"] = relationship(back_populates="resources")
-
-    url: Mapped[str]
-    file_name: Mapped[str]  # Human-readable name
-    file_size: Mapped[int]
-    state: Mapped[ResourceState]
-    fail_message: Mapped[Optional[str]]
-    date_discovered: Mapped[datetime]
-
-    module_items: Mapped[List["ModuleItem"]] = relationship(secondary=ResourceToModuleItemAssociation.__table__,
-                                                            back_populates="resources", order_by="ModuleItem.position")
-    assignments: Mapped[List["Assignment"]] = relationship(secondary=ResourceToAssignmentAssociation.__table__,
-                                                           back_populates="resources")
-
-    def __init__(self, id: str, url: str, file_name: str, file_size: int,
-                 date_discovered: datetime = datetime.now(),
-                 fail_message: Optional[str] = None, state=ResourceState.NOT_DOWNLOADED):
-        super().__init__()
-        self.id = id
-        self.url = url
-        self.file_name = file_name
-        self.file_size = file_size
-        self.fail_message = fail_message
-        self.state = state
-        self.date_discovered = date_discovered
-
-    def __eq__(self, __value):
-        if isinstance(__value, ModulePage):
-            return self.id == __value.id
-        else:
-            return super().__eq__(__value)
-
-    @property
-    def text(self) -> str:
-        return self.file_name
-
-    @property
-    def download_location(self) -> pathlib.Path:
-        file_id: str = self.id
-
-        # Colon is illegal in microsoft windows file names
-        if platform.system() == "Windows":
-            file_id = file_id.replace(':', '$')
-
-        file_name, file_extension = os.path.splitext(self.file_name)
-
-        return pathlib.Path("download", self._sanitise_course_name(self.course.name),
-                            f"{file_name} [{file_id}]{file_extension}")
-
-    @staticmethod
-    def _sanitise_course_name(name: str) -> str:
-        return re.sub("[/\\\\<>:\"?|*]", "_", name)
-
-
-class ModuleItem(MappedAsDataclass, Base, tree.HasText):
-    __tablename__ = "module_items"
-
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    module_id: Mapped[str] = mapped_column(ForeignKey("modules.id"))
-    module: Mapped["Module"] = relationship(back_populates="items")
-
-    course_id: Mapped[str] = mapped_column(ForeignKey("courses.id"))
-    course: Mapped["Course"] = relationship(back_populates="module_items")
-
-    created_at: Mapped[datetime]
-    updated_at: Mapped[datetime]
-    name: Mapped[str]
-    position: Mapped[int]
-    type: Mapped[str]
-
-    resources: Mapped[List["Resource"]] = relationship(secondary=ResourceToModuleItemAssociation.__table__,
-                                                       back_populates="module_items")
-
-    __mapper_args__ = {
-        "polymorphic_identity": "module_item",
-        "polymorphic_on": "type",
-    }
-
-    def __init__(self, id: str, created_at: datetime, updated_at: datetime, name: str):
-        super().__init__()
-
-        self.id = id
-        self.created_at = created_at
-        self.updated_at = updated_at
-        self.name = name
-
-    @property
-    def text(self) -> str:
-        return self.name
-
-
-class ModuleFile(ModuleItem):
-    __tablename__ = "module_files"
-
-    id: Mapped[str] = mapped_column(ForeignKey("module_items.id"), primary_key=True)
-
-    __mapper_args__ = {
-        "polymorphic_identity": "module_file",
-    }
-
-    def __init__(self, id: str, created_at: datetime, updated_at: datetime, name: str):
-        super().__init__(id, created_at, updated_at, name)
-
-        self.id = id
-
-
-class ModulePage(ModuleItem, PageLike):
-    __tablename__ = "module_pages"
-
-    id: Mapped[str] = mapped_column(ForeignKey("module_items.id"), primary_key=True)
-
-    content: Mapped[str] = mapped_column()
-
-    __mapper_args__ = {
-        "polymorphic_identity": "module_page",
-    }
-
-    def __init__(self, id: str, created_at: datetime, updated_at: datetime, name: str, content: str = "Not loaded"):
-        super().__init__(id, created_at, updated_at, name)
-
-        self.id = id
-        self.content = content
-
-    def __eq__(self, __value):
-        if isinstance(__value, ModulePage):
-            return self.id == __value.id
-        else:
-            return super().__eq__(__value)
-
-
-class Assignment(MappedAsDataclass, Base, PageLike, tree.HasText, init=False):
-    __tablename__ = "assignments"
-
-    id: Mapped[str] = mapped_column(primary_key=True)
-
-    course_id: Mapped[str] = mapped_column(ForeignKey("courses.id"))
-    course: Mapped["Course"] = relationship(back_populates="assignments")
-
-    name: Mapped[str]
-    description: Mapped[Optional[str]] = mapped_column(Text, repr=False)
-    due_at: Mapped[Optional[datetime]]
-    created_at: Mapped[datetime]
-    updated_at: Mapped[datetime]
-    position: Mapped[int]
-
-    resources: Mapped[List["Resource"]] = relationship(secondary=ResourceToAssignmentAssociation.__table__,
-                                                       back_populates="assignments")
-
-    @property
-    def content(self) -> str:
-        return self.description
-
-    @property
-    def text(self) -> str:
-        return self.name

qcanvas/db/db_converter_helper.py

@@ -1,81 +0,0 @@
-from datetime import datetime
-
-import qcanvas.db.database as db
-import qcanvas.queries as gql
-from qcanvas.net.canvas.legacy_canvas_types import LegacyFile
-from qcanvas.util.helpers.canvas_sanitiser import remove_garbage_from_title as clean_string
-
-
-def convert_term(term: gql.Term) -> db.Term:
-    return db.Term(
-        id=term.q_id,
-        name=clean_string(term.name),
-        start_at=term.start_at,
-        end_at=term.end_at
-    )
-
-
-def convert_course(course: gql.Course) -> db.Course:
-    return db.Course(
-        id=course.m_id,
-        name=clean_string(course.name),
-        local_name=clean_string(course.course_nickname)
-    )
-
-
-def convert_assignment(assignment: gql.Assignment) -> db.Assignment:
-    return db.Assignment(
-        id=assignment.q_id,
-        name=clean_string(assignment.name),
-        description=assignment.description,
-        due_at=assignment.due_at,
-        created_at=assignment.created_at,
-        updated_at=assignment.updated_at,
-        position=assignment.position
-    )
-
-
-def convert_page(page: gql.Page, content: str) -> db.ModulePage:
-    return db.ModulePage(
-        id=page.m_id,
-        content=content,
-        created_at=page.created_at,
-        updated_at=page.updated_at,
-        name=clean_string(page.title)
-    )
-
-
-def convert_file_page(file: gql.File) -> db.ModuleFile:
-    return db.ModuleFile(
-        id=file.m_id,
-        created_at=file.created_at,
-        updated_at=file.updated_at,
-        name=clean_string(file.display_name)
-    )
-
-
-def convert_file(file: gql.File, file_size: int) -> db.Resource:
-    return db.Resource(
-        id=str(file.m_id),
-        url=file.url,
-        file_name=clean_string(file.display_name),
-        date_discovered=datetime.now(),
-        file_size=file_size
-    )
-
-
-def convert_legacy_file(file: LegacyFile) -> db.Resource:
-    return db.Resource(
-        id=str(file.id),
-        url=file.url,
-        file_name=clean_string(file.display_name),
-        date_discovered=datetime.now(),
-        file_size=file.size
-    )
-
-
-def convert_module(module: gql.Module) -> db.Module:
-    return db.Module(
-        id=module.q_id,
-        name=clean_string(module.name)
-    )

qcanvas/net/canvas/__init__.py

@@ -1,2 +0,0 @@
-from .canvas_client import CanvasClient
-from .legacy_canvas_types import LegacyFile, LegacyPage