qcanvas 0.0.5a0__tar.gz → 0.0.5.2a0__tar.gz

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 0.0.5a0
+Version: 0.0.5.2a0
 Summary: A canvas client
 Author: QCanvas
 Classifier: Operating System :: OS Independent

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name="qcanvas"
-version = "0.0.5a"
+version = "0.0.5.2a"
 authors= [ {name="QCanvas"} ]
 description="A canvas client"
 requires-python=">=3.11,<=3.12"

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/net/canvas/canvas_client.py

@@ -132,6 +132,27 @@ class CanvasClient(SelfAuthenticating):
 
             return LegacyFile.from_dict(json.loads(response.text))
 
+    @retry(
+        wait=wait_exponential(exp_base=1.2, max=10) + wait_random(0, 1),
+        retry=retry_if_exception_type(RatelimitedException),
+        stop=stop_after_attempt(8)
+    )
+    async def get_temp_session_link(self) -> str | None:
+        """
+        Gets the link which will authenticate a browser/open canvas using a 'legacy session token'
+        Returns
+        -------
+        str | None
+            The url as a string if the request succeeded, None if it didn't
+        """
+
+        token_response = await self.client.get(self.canvas_url.join("login/session_token"), **self.get_headers())
+
+        if token_response.is_success:
+            return json.loads(token_response.text)["session_url"]
+        else:
+            return None
+
     @retry(
         stop=stop_after_attempt(3),
         wait=wait_fixed(5) + wait_random(0, 1),

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/ui/container_item.py

@@ -1,4 +1,3 @@
-from PySide6.QtCore import Qt
 from PySide6.QtGui import QStandardItem
 
 from qcanvas.util import tree_util as tree
@@ -9,7 +8,4 @@ class ContainerItem(QStandardItem):
         super().__init__()
         self.content = data
         self.setEditable(False)
-
-    def data(self, role=257):
-        if role == Qt.ItemDataRole.DisplayRole:
-            return self.content.text
+        self.setText(data.text)

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/ui/main_ui.py

@@ -3,8 +3,8 @@ import sys
 import traceback
 from typing import Sequence, Optional
 
-from PySide6.QtCore import Slot, Signal, Qt, QUrl
-from PySide6.QtGui import QDesktopServices
+from PySide6.QtCore import Slot, Signal, Qt, QUrl, QObject
+from PySide6.QtGui import QDesktopServices, QKeySequence
 from PySide6.QtWidgets import *
 from qasync import asyncSlot
 
@@ -20,9 +20,10 @@ from qcanvas.util import self_updater
 from qcanvas.util.app_settings import settings
 from qcanvas.util.constants import app_name
 from qcanvas.util.course_indexer import DataManager
+from qcanvas.util.helpers.qaction_helper import create_qaction
 
 _aux_settings = settings.auxiliary
-
+_no_course_selected_text = "No course selected"
 
 class AppMainWindow(QMainWindow):
     logger = logging.getLogger()
@@ -62,17 +63,15 @@ class AppMainWindow(QMainWindow):
         self.tab_widget.insertTab(1, self.assignment_viewer, "Assignments")
         self.tab_widget.insertTab(2, self.pages_viewer, "Pages")
 
-        h_layout = QHBoxLayout()
-        h_layout.addWidget(self.course_list)
-        h_layout.addWidget(self.tab_widget)
-        h_layout.setStretch(1, 1)
+        self.course_name_label = QLabel(_no_course_selected_text)
+        self.course_name_label.setStyleSheet("font-weight: bold;")
+        course_stack_layout = self.create_layout_and_add_widgets(QVBoxLayout, self.course_name_label, self.tab_widget)
 
-        v_layout = QVBoxLayout()
-        v_layout.addLayout(h_layout)
-        v_layout.addWidget(self.sync_button)
+        h_layout = self.create_layout_and_add_widgets(QHBoxLayout, self.course_list, course_stack_layout)
+        h_layout.setStretch(1, 1)
 
         widget = QWidget()
-        widget.setLayout(v_layout)
+        widget.setLayout(self.create_layout_and_add_widgets(QVBoxLayout, h_layout, self.sync_button))
         self.setCentralWidget(widget)
 
         self.setup_menu_bar()
@@ -90,12 +89,26 @@ class AppMainWindow(QMainWindow):
         # Set its height so it doesn't get bigger when there's a progress bar in it
         bar.setFixedHeight(bar.height())
 
+    @staticmethod
+    def create_layout_and_add_widgets(layout_type: type, *widgets) -> QLayout:
+        layout = layout_type()
+
+        for widget in widgets:
+            if isinstance(widget, QLayout):
+                layout.addLayout(widget)
+            else:
+                layout.addWidget(widget)
+
+        return layout
+
     def setup_menu_bar(self):
         menu_bar = self.menuBar()
 
-        menu_bar.addMenu(ThemeSelectionMenu())
-        view_menu = menu_bar.addMenu("View")
+        app_menu: QMenu = menu_bar.addMenu("App")
+        view_menu: QMenu = menu_bar.addMenu("View")
 
+        app_menu.addAction(self.setup_quick_authentication_action(app_menu))
+        app_menu.addMenu(ThemeSelectionMenu())
         view_menu.addMenu(self.setup_group_by_menu())
 
     def setup_group_by_menu(self) -> QMenu:
@@ -105,6 +118,18 @@ class AppMainWindow(QMainWindow):
 
         return file_grouping_menu
 
+    def setup_quick_authentication_action(self, parent: QObject):
+        return create_qaction(
+            name="Quick canvas login",
+            shortcut=QKeySequence("Ctrl+O"),
+            triggered=self.open_quick_auth_in_browser,
+            parent=parent
+        )
+
+    @asyncSlot()
+    async def open_quick_auth_in_browser(self):
+        QDesktopServices.openUrl(await self.data_manager.client.get_temp_session_link())
+
     def closeEvent(self, event):
         settings.geometry = self.saveGeometry()
         settings.window_state = self.saveState()
@@ -205,9 +230,11 @@ class AppMainWindow(QMainWindow):
             self.pages_viewer.fill_tree(course)
             self.assignment_viewer.fill_tree(course)
             self.file_viewer.load_course_files(course)
+            self.course_name_label.setText(course.name)
         else:
             self.selected_course = None
             self.file_viewer.clear()
+            self.course_name_label.setText(_no_course_selected_text)
 
     @asyncSlot(db.CoursePreferences)
     async def on_grouping_preference_changed(self):

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/ui/viewer/course_list.py

@@ -56,6 +56,7 @@ class CourseList(QTreeView):
         for term, courses in self.group_courses_by_term(courses):
             term_node = QStandardItem(term.name)
             term_node.setEditable(False)
+            term_node.setSelectable(False)
 
             for course in courses:
                 course_node = CourseNode(course)

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/ui/viewer/page_list_viewer.py

@@ -10,6 +10,7 @@ import qcanvas.db as db
 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
 
 
@@ -97,7 +98,7 @@ class PageLikeViewer(QWidget):
                     return
 
                 # todo when a file is finished downloading it would be nice if the page was refreshed to show the state properly
-                html = canvas_garbage_remover.remove_stylesheets_from_html(item.content)
+                html = canvas_sanitiser.remove_stylesheets_from_html(item.content)
                 self.viewer.setHtml(self.link_transformer.transform_links(html))
 
 
@@ -113,6 +114,7 @@ class PagesViewer(PageLikeViewer):
                 continue
 
             module_node = ContainerItem(module)
+            module_node.setSelectable(False)
 
             for module_item in list[db.ModuleItem](module.items):
                 module_node.appendRow(ContainerItem(module_item))

{qcanvas-0.0.5a0 → qcanvas-0.0.5.2a0}/qcanvas/util/course_indexer/data_manager.py

@@ -83,7 +83,7 @@ class DataManager:
                  sessionmaker: AsyncSessionMaker,
                  link_scanners: Sequence[ResourceScanner]):
 
-        self._client = client
+        self.client = client
         self._link_scanners = link_scanners
         self._session_maker = sessionmaker
 
@@ -188,7 +188,7 @@ class DataManager:
 
     async def synchronize_with_canvas(self, progress_reporter: ProgressReporter = noop_reporter):
         section = progress_reporter.section("Loading index", 0)
-        raw_query = (await self._client.do_graphql_query(gql(queries.all_courses.DEFINITION), detailed=True))
+        raw_query = (await self.client.do_graphql_query(gql(queries.all_courses.DEFINITION), detailed=True))
         section.increment_progress()
 
         await self.load_courses_data(queries.AllCoursesQueryData(**raw_query).all_courses, progress_reporter)
@@ -343,7 +343,7 @@ class DataManager:
         Fetches information about the specified file from canvas
         """
         _logger.debug(f"Fetching file (for module file) %s %s", file.m_id, file.display_name)
-        result = await self._client.get_file(file.m_id, course_id)
+        result = await self.client.get_file(file.m_id, course_id)
         resource = db.convert_file(file, result.size)
         resource.id = f"{canvas_resource_id_prefix}:{resource.id}"
         resource.course_id = course_id
@@ -369,7 +369,7 @@ class DataManager:
 
         try:
             # Get the page
-            result = await self._client.get_page(page.m_id, course_id)
+            result = await self.client.get_page(page.m_id, course_id)
         except BaseException as e:
             # Handle any errors
             _logger.error(e)