qcanvas 1.0.7__tar.gz → 1.0.9.dev0__tar.gz

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.7
+Version: 1.0.9.dev0
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
@@ -15,9 +15,10 @@ 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.10a3)
+Requires-Dist: qcanvas-backend (==0.1.10a5)
 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)
 Description-Content-Type: text/markdown
 
 # QCanvas

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/pyproject.toml

@@ -1,11 +1,13 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.7"
+version = "1.0.9.dev0"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
 exclude = [
-    "images"
+    "images",
+    "flatpak",
+    "appimage",
 ]
 
 [tool.poetry.scripts]
@@ -14,7 +16,7 @@ qcanvas = "qcanvas.run:main"
 [tool.poetry.dependencies]
 python = ">=3.11,<3.13"
 qcanvas-api-clients = "^0.2.2"
-qcanvas-backend = "0.1.10a3"
+qcanvas-backend = "0.1.10a5"
 asynctaskpool = "^0.2.1"
 sqlalchemy = "^2.0.31"
 qtpy = "^2.4.1"
@@ -23,6 +25,7 @@ pyqtdarktheme-fork = "^2.3.2"
 qasync = "^0.27.1"
 lightdb = "^2.0"
 platformdirs = "^4.2.2"
+validators = "^0.33.0"
 
 [tool.poetry.group.flatpak-exclude.dependencies]
 pyside6 = "^6.7.2"

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/icons/file-download-failed.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file-times</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.066 15.935c-0.136-0.136-0.324-0.22-0.531-0.22s-0.395 0.084-0.531 0.22v0l-3.004 3.004-3.005-3.004c-0.136-0.141-0.327-0.228-0.538-0.228-0.414 0-0.75 0.336-0.75 0.75 0 0.211 0.087 0.402 0.228 0.538l3.004 3.005-3.004 3.004c-0.136 0.136-0.22 0.324-0.22 0.531 0 0.415 0.336 0.751 0.751 0.751 0.207 0 0.395-0.084 0.53-0.219v0l3.005-3.005 3.004 3.005c0.136 0.136 0.324 0.22 0.531 0.22 0.415 0 0.751-0.336 0.751-0.751 0-0.207-0.084-0.395-0.22-0.531l-3.005-3.004 3.005-3.005c0.135-0.136 0.218-0.323 0.218-0.53s-0.083-0.394-0.218-0.53l0 0z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file-times</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.066 15.935c-0.136-0.136-0.324-0.22-0.531-0.22s-0.395 0.084-0.531 0.22v0l-3.004 3.004-3.005-3.004c-0.136-0.141-0.327-0.228-0.538-0.228-0.414 0-0.75 0.336-0.75 0.75 0 0.211 0.087 0.402 0.228 0.538l3.004 3.005-3.004 3.004c-0.136 0.136-0.22 0.324-0.22 0.531 0 0.415 0.336 0.751 0.751 0.751 0.207 0 0.395-0.084 0.53-0.219v0l3.005-3.005 3.004 3.005c0.136 0.136 0.324 0.22 0.531 0.22 0.415 0 0.751-0.336 0.751-0.751 0-0.207-0.084-0.395-0.22-0.531l-3.005-3.004 3.005-3.005c0.135-0.136 0.218-0.323 0.218-0.53s-0.083-0.394-0.218-0.53l0 0z"></path>
 </svg>

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/icons/file-downloaded.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5z"></path>
 </svg>

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/icons/file-not-downloaded.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file-arrow-down</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.469 20.91l-3.719 3.721v-10.676c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v0 10.675l-3.72-3.72c-0.136-0.134-0.322-0.218-0.528-0.218-0.415 0-0.751 0.336-0.751 0.751 0 0.207 0.083 0.394 0.219 0.529l5 5c0.026 0.026 0.065 0.017 0.093 0.038 0.052 0.040 0.088 0.098 0.15 0.124 0.085 0.035 0.184 0.056 0.287 0.057h0c0 0 0 0 0 0 0.207 0 0.394-0.084 0.53-0.219l5.001-5c0.136-0.136 0.22-0.324 0.22-0.531 0-0.415-0.336-0.751-0.751-0.751-0.207 0-0.395 0.084-0.531 0.22v0z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file-arrow-down</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.469 20.91l-3.719 3.721v-10.676c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v0 10.675l-3.72-3.72c-0.136-0.134-0.322-0.218-0.528-0.218-0.415 0-0.751 0.336-0.751 0.751 0 0.207 0.083 0.394 0.219 0.529l5 5c0.026 0.026 0.065 0.017 0.093 0.038 0.052 0.040 0.088 0.098 0.15 0.124 0.085 0.035 0.184 0.056 0.287 0.057h0c0 0 0 0 0 0 0.207 0 0.394-0.084 0.53-0.219l5.001-5c0.136-0.136 0.22-0.324 0.22-0.531 0-0.415-0.336-0.751-0.751-0.751-0.207 0-0.395 0.084-0.531 0.22v0z"></path>
 </svg>

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/icons/file-unknown.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>question</title>
-    <path d="M19.943 5.251c-1.145-0.635-2.511-1.008-3.964-1.008-1.461 0-2.834 0.378-4.026 1.040l0.042-0.022c-1.649 0.916-2.746 2.648-2.746 4.635 0 0.037 0 0.074 0.001 0.111l-0-0.006c0.001 0.413 0.336 0.747 0.75 0.747 0 0 0 0 0 0h-0c0.407-0.021 0.731-0.346 0.75-0.751l0-0.002c-0.001-0.026-0.001-0.058-0.001-0.089 0-1.441 0.8-2.694 1.98-3.341l0.020-0.010c0.934-0.511 2.047-0.812 3.23-0.812 1.178 0 2.287 0.298 3.255 0.824l-0.036-0.018c1.23 0.657 2.053 1.933 2.053 3.401 0 0.017-0 0.033-0 0.050l0-0.003c0.033 0.19 0.051 0.408 0.051 0.631 0 1.699-1.084 3.145-2.598 3.684l-0.027 0.008c-2.303 1.102-3.424 3.285-3.426 6.677 0 0 0 0 0 0.001 0 0.414 0.335 0.749 0.749 0.749h0.001c0.414-0 0.75-0.336 0.75-0.75v0c0.002-2.793 0.819-4.485 2.586-5.329 2.037-0.783 3.457-2.725 3.457-4.997 0-0.238-0.016-0.473-0.046-0.703l0.003 0.027c0-0.017 0-0.037 0-0.057 0-2.018-1.123-3.774-2.779-4.676l-0.028-0.014zM15.46 25.459c-0.123 0.145-0.198 0.334-0.2 0.541v0c-0.001 0.016-0.002 0.034-0.002 0.052 0 0.082 0.015 0.16 0.044 0.231l-0.002-0.004c0.039 0.094 0.093 0.173 0.16 0.24l0 0c0.071 0.076 0.158 0.137 0.255 0.178l0.005 0.002c0.084 0.026 0.18 0.041 0.28 0.041s0.196-0.015 0.287-0.043l-0.007 0.002c0.102-0.043 0.189-0.104 0.26-0.179l0-0c0.067-0.067 0.12-0.147 0.157-0.235l0.002-0.005c0.038-0.079 0.061-0.173 0.061-0.271 0-0.003-0-0.006-0-0.009v0c-0.010-0.209-0.092-0.397-0.221-0.542l0.001 0.001c-0.145-0.121-0.334-0.195-0.54-0.195s-0.395 0.074-0.541 0.196l0.001-0.001z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>question</title>
+    <path d="M19.943 5.251c-1.145-0.635-2.511-1.008-3.964-1.008-1.461 0-2.834 0.378-4.026 1.040l0.042-0.022c-1.649 0.916-2.746 2.648-2.746 4.635 0 0.037 0 0.074 0.001 0.111l-0-0.006c0.001 0.413 0.336 0.747 0.75 0.747 0 0 0 0 0 0h-0c0.407-0.021 0.731-0.346 0.75-0.751l0-0.002c-0.001-0.026-0.001-0.058-0.001-0.089 0-1.441 0.8-2.694 1.98-3.341l0.020-0.010c0.934-0.511 2.047-0.812 3.23-0.812 1.178 0 2.287 0.298 3.255 0.824l-0.036-0.018c1.23 0.657 2.053 1.933 2.053 3.401 0 0.017-0 0.033-0 0.050l0-0.003c0.033 0.19 0.051 0.408 0.051 0.631 0 1.699-1.084 3.145-2.598 3.684l-0.027 0.008c-2.303 1.102-3.424 3.285-3.426 6.677 0 0 0 0 0 0.001 0 0.414 0.335 0.749 0.749 0.749h0.001c0.414-0 0.75-0.336 0.75-0.75v0c0.002-2.793 0.819-4.485 2.586-5.329 2.037-0.783 3.457-2.725 3.457-4.997 0-0.238-0.016-0.473-0.046-0.703l0.003 0.027c0-0.017 0-0.037 0-0.057 0-2.018-1.123-3.774-2.779-4.676l-0.028-0.014zM15.46 25.459c-0.123 0.145-0.198 0.334-0.2 0.541v0c-0.001 0.016-0.002 0.034-0.002 0.052 0 0.082 0.015 0.16 0.044 0.231l-0.002-0.004c0.039 0.094 0.093 0.173 0.16 0.24l0 0c0.071 0.076 0.158 0.137 0.255 0.178l0.005 0.002c0.084 0.026 0.18 0.041 0.28 0.041s0.196-0.015 0.287-0.043l-0.007 0.002c0.102-0.043 0.189-0.104 0.26-0.179l0-0c0.067-0.067 0.12-0.147 0.157-0.235l0.002-0.005c0.038-0.079 0.061-0.173 0.061-0.271 0-0.003-0-0.006-0-0.009v0c-0.010-0.209-0.092-0.397-0.221-0.542l0.001 0.001c-0.145-0.121-0.334-0.195-0.54-0.195s-0.395 0.074-0.541 0.196l0.001-0.001z"></path>
 </svg>

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/run.py

@@ -1,5 +1,5 @@
 import logging
-from logging import DEBUG, INFO, WARNING
+from logging import INFO, WARNING
 
 import qcanvas.app_start
 from qcanvas.util import logs, paths
@@ -17,7 +17,7 @@ logs.set_levels(
         "qcanvas": INFO,
         "qcanvas.ui": WARNING,
         "qcanvas_backend": INFO,
-        "qcanvas.ui.main_ui.status_bar_progress_display": DEBUG,
+        "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
     }
 )
 

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/content_tree.py

@@ -2,6 +2,7 @@ import logging
 from abc import abstractmethod
 from typing import *
 
+import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
 from qtpy.QtCore import QItemSelection, Signal, Slot
 from qtpy.QtWidgets import *
@@ -12,11 +13,20 @@ from qcanvas.util.basic_fonts import bold_font, normal_font
 _logger = logging.getLogger(__name__)
 
 T = TypeVar("T")
+U = TypeVar("U", bound=Type["ContentTree"])
 
 
 class ContentTree(MemoryTreeWidget, Generic[T]):
     item_selected = Signal(object)
 
+    @classmethod
+    def create_from_receipt(
+        cls: U, course: db.Course, *, sync_receipt: Optional[SyncReceipt]
+    ) -> Type[U]:
+        tree = cls(course.id)
+        tree.reload(course, sync_receipt=sync_receipt)
+        return tree
+
     def __init__(
         self,
         tree_name: str,

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/course_tree.py

@@ -85,7 +85,3 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
         term_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
 
         return term_widget
-
-    # @Slot(db.Course, str)
-    # def _on_course_renamed(self, course: db.Course, new_name: str) -> None:
-    #     self.course_renamed.emit(course, new_name)

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py

@@ -16,16 +16,6 @@ _logger = logging.getLogger(__name__)
 
 
 class AssignmentTab(ContentTab):
-    @staticmethod
-    def create_from_receipt(
-        *,
-        course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
-        downloader: ResourceManager,
-    ) -> "AssignmentTab":
-        return AssignmentTab(
-            course=course, sync_receipt=sync_receipt, downloader=downloader
-        )
 
     def __init__(
         self,

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py

@@ -13,14 +13,6 @@ _logger = logging.getLogger(__name__)
 
 
 class AssignmentTree(ContentTree[db.Course]):
-    @staticmethod
-    def create_from_receipt(
-        course: db.Course, *, sync_receipt: Optional[SyncReceipt]
-    ) -> "AssignmentTree":
-        tree = AssignmentTree(course.id)
-        tree.reload(course, sync_receipt=sync_receipt)
-        return tree
-
     def __init__(self, course_id: str):
         super().__init__(
             tree_name=f"course.{course_id}.assignment_groups",

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/content_tab.py

@@ -14,8 +14,20 @@ from qcanvas.util.ui_tools import make_truncatable
 
 _logger = logging.getLogger(__name__)
 
+T = TypeVar("T", bound=Type["ContentTab"])
+
 
 class ContentTab(QWidget):
+    @classmethod
+    def create_from_receipt(
+        cls: T,
+        *,
+        course: db.Course,
+        sync_receipt: Optional[SyncReceipt],
+        downloader: ResourceManager,
+    ) -> Type[T]:
+        return cls(course=course, sync_receipt=sync_receipt, downloader=downloader)
+
     def __init__(
         self,
         *,

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/mail_tab/mail_tab.py

@@ -17,15 +17,6 @@ _logger = logging.getLogger(__name__)
 
 # todo maybe update has_been_read? probably not the responsibility of this class though
 class MailTab(ContentTab):
-    @staticmethod
-    def create_from_receipt(
-        *,
-        course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
-        downloader: ResourceManager,
-    ) -> "MailTab":
-        return MailTab(course=course, sync_receipt=sync_receipt, downloader=downloader)
-
     def __init__(
         self,
         *,

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/mail_tab/mail_tree.py

@@ -12,13 +12,6 @@ _logger = logging.getLogger(__name__)
 
 
 class MailTree(ContentTree[db.Course]):
-    @staticmethod
-    def create_from_receipt(
-        course: db.Course, *, sync_receipt: Optional[SyncReceipt]
-    ) -> "MailTree":
-        tree = MailTree(course.id)
-        tree.reload(course, sync_receipt=sync_receipt)
-        return tree
 
     def __init__(self, course_id: str):
         super().__init__(

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/page_tab/page_tab.py

@@ -12,16 +12,6 @@ _logger = logging.getLogger(__name__)
 
 
 class PageTab(ContentTab):
-
-    @staticmethod
-    def create_from_receipt(
-        *,
-        course: db.Course,
-        sync_receipt: Optional[SyncReceipt],
-        downloader: ResourceManager,
-    ) -> "PageTab":
-        return PageTab(course=course, sync_receipt=sync_receipt, downloader=downloader)
-
     def __init__(
         self,
         *,

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py

@@ -12,14 +12,6 @@ _logger = logging.getLogger(__name__)
 
 
 class PageTree(ContentTree[db.Course]):
-    @staticmethod
-    def create_from_receipt(
-        course: db.Course, *, sync_receipt: Optional[SyncReceipt]
-    ) -> "PageTree":
-        tree = PageTree(course.id)
-        tree.reload(course, sync_receipt=sync_receipt)
-        return tree
-
     def __init__(self, course_id: str):
         super().__init__(
             tree_name=f"course.{course_id}.modules",

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/main_ui/status_bar_progress_display.py

@@ -62,7 +62,7 @@ class StatusBarProgressDisplay(QStatusBar):
 
     @asyncSlot(TaskID, object)
     async def _on_task_failed(self, task_id: TaskID, context: object) -> None:
-        _logger.debug("%s failed", task_id)
+        _logger.info("%s failed", task_id)
 
         async with self._lock:
             self._remove_task(task_id)
@@ -83,8 +83,8 @@ class StatusBarProgressDisplay(QStatusBar):
                 self._show_multiple_tasks_progress(list(self._tasks.values()))
 
     def _show_done(self) -> None:
-        _logger.debug("Finished tasks. Tasks: %s", self._tasks)
-        self.showMessage("All tasks finished", 5000)
+        _logger.info("Finished tasks. Tasks: %s", self._tasks)
+        self.showMessage("Done", 5000)
         self._progress_bar.hide()
 
     def _show_single_task_progress(self, task: Tuple[TaskID, _TaskProgress]) -> None:
@@ -132,12 +132,12 @@ class StatusBarProgressDisplay(QStatusBar):
 
     def _add_task(self, task: TaskID, current: int, total: int) -> None:
         self._tasks[task] = _TaskProgress(current, total)
-        _logger.debug("Added task %s", task)
+        _logger.info("Added task %s", task)
         _logger.debug("Tasks: %s", self._tasks)
 
     def _remove_task(self, task: TaskID) -> None:
         self._tasks.pop(task, None)
-        _logger.debug("Removed task %s", task)
+        _logger.info("Removed task %s", task)
         _logger.debug("Tasks: %s", self._tasks)
 
     @property

{qcanvas-1.0.7 → qcanvas-1.0.9.dev0}/qcanvas/ui/setup/setup_dialog.py

@@ -34,13 +34,16 @@ class SetupDialog(QDialog):
 
         self._semaphore = Semaphore()
         self._canvas_url_box = QLineEdit(settings.client.canvas_url)
+        self._canvas_url_box.setPlaceholderText("https://instance.canvas.com")
         self._canvas_api_key_box = QLineEdit(settings.client.canvas_api_key)
         self._canvas_api_key_box.setEchoMode(QLineEdit.EchoMode.Password)
         self._panopto_url_box = QLineEdit(settings.client.panopto_url)
+        self._panopto_url_box.setPlaceholderText("https://instance.panopto.com")
         self._button_box = self._setup_button_box()
         self._button_box.accepted.connect(self._accepted)
         self._button_box.helpRequested.connect(self._help_requested)
         self._waiting_indicator = self._setup_progress_bar()
+        self._status_bar = QStatusBar()
 
         self.setLayout(
             layout(
@@ -54,13 +57,14 @@ class SetupDialog(QDialog):
                 ),
                 self._waiting_indicator,
                 self._button_box,
+                self._status_bar,
             )
         )
 
     def _setup_button_box(self) -> QDialogButtonBox:
         box = QDialogButtonBox()
         box.addButton(QDialogButtonBox.StandardButton.Ok)
-        box.addButton("Get a canvas API key", QDialogButtonBox.ButtonRole.HelpRole)
+        box.addButton("Get a Canvas API key", QDialogButtonBox.ButtonRole.HelpRole)
         return box
 
     def _setup_progress_bar(self) -> QProgressBar:
@@ -81,10 +85,13 @@ class SetupDialog(QDialog):
         if self._semaphore.acquire(False):
             try:
                 self._clear_errors()
-                if self._check_inputs():
+
+                if not self._all_inputs_valid():
+                    self._status_bar.showMessage("Invalid input!", 5000)
                     return
 
                 self._waiting_indicator.setVisible(True)
+                self._status_bar.showMessage("Checking configuration...")
 
                 canvas_config = CanvasClientConfig(
                     api_token=self._canvas_api_key_box.text().strip(),
@@ -97,7 +104,9 @@ class SetupDialog(QDialog):
                 if not await self._check_panopto_config(canvas_config):
                     self._show_panopto_help()
                     return
-
+            except Exception as e:
+                self._status_bar.showMessage(f"An error occurred: {e}", 5000)
+                _logger.warning("Checking config failed", exc_info=e)
             finally:
                 self._waiting_indicator.setVisible(False)
                 self._semaphore.release()
@@ -113,23 +122,24 @@ class SetupDialog(QDialog):
             self._panopto_url_box,
             self._canvas_api_key_box,
         ]:
+            self._status_bar.clearMessage()
             line_edit.setStyleSheet(None)
             line_edit.setToolTip(None)
 
-    def _check_inputs(self) -> bool:
-        had_error = False
+    def _all_inputs_valid(self) -> bool:
+        all_valid = True
 
         if not is_url(self._get_url(self._canvas_url_box)):
-            had_error = True
+            all_valid = False
             self._show_error(self._canvas_url_box, "Canvas URL is invalid")
         if len(self._canvas_api_key_box.text().strip()) == 0:
-            had_error = True
+            all_valid = False
             self._show_error(self._canvas_api_key_box, "Canvas API key is empty")
         if not is_url(self._get_url(self._panopto_url_box)):
-            had_error = True
+            all_valid = False
             self._show_error(self._panopto_url_box, "Panopto URL is invalid")
 
-        return had_error
+        return all_valid
 
     def _get_url(self, line_edit: QLineEdit) -> str:
         url = line_edit.text().strip()
@@ -172,8 +182,8 @@ class SetupDialog(QDialog):
         msg = QMessageBox(
             QMessageBox.Icon.Information,
             "Panopto Authentication",
-            "In order for QCanvas to use panopto, you need to link your panopto account to your canvas account. "
-            "A page will open in your web browser to do this when you click OK. It may ask you to sign into canvas.\n\n"
+            "In order for QCanvas to use Panopto, you need to link your Panopto account to your Canvas account. "
+            "A page will open in your web browser to do this when you click OK. It may ask you to sign into Canvas.\n\n"
             'Please tick "Remember my authorisation for this service" or QCanvas may not function correctly.\n\n'
             "QCanvas can't access anything entered in your browser.",
             QMessageBox.StandardButton.Ok,

qcanvas-1.0.9.dev0/qcanvas/util/url_checker.py

@@ -0,0 +1,9 @@
+import logging
+
+import validators
+
+_logger = logging.getLogger(__name__)
+
+
+def is_url(url: str) -> bool:
+    return validators.url(url) == True

qcanvas-1.0.7/qcanvas/util/url_checker.py

@@ -1,13 +0,0 @@
-import logging
-from urllib.parse import urlparse
-
-_logger = logging.getLogger(__name__)
-
-
-def is_url(url: str) -> bool:
-    # https://overflow.perennialte.ch/questions/7160737/how-to-validate-a-url-in-python-malformed-or-not#
-    try:
-        result = urlparse(url)
-        return all([result.scheme, result.netloc])
-    except ValueError:
-        return False