qcanvas 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

qcanvas/__init__.py

@@ -23,6 +23,7 @@
 # nuitka-project: --nofollow-import-to=yt_dlp.extractor.lazy_extractors
 
 import logging
+import logging.config
 from logging import INFO, WARNING
 
 import qcanvas.app as app
@@ -34,18 +35,23 @@ def main():
 
     logging.basicConfig(
         filemode="w",
-        filename=paths.data_storage() / "debug.log",
+        filename=paths.data_storage() / "qcanvas.log",
         level="WARN",
     )
 
-    logs.set_levels(
-        {
-            "qcanvas": INFO,
-            "qcanvas.ui": WARNING,
-            "libqcanvas": INFO,
-            "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
-        }
-    )
+    log_config = paths.data_storage() / "logging.ini"
+
+    if log_config.exists():
+        logging.config.fileConfig(log_config, disable_existing_loggers=False)
+    else:
+        logs.set_levels(
+            {
+                "qcanvas": INFO,
+                "qcanvas.ui": WARNING,
+                "libqcanvas": INFO,
+                "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
+            }
+        )
 
     app.launch()
 

qcanvas/app.py

@@ -36,6 +36,7 @@ class _MainStarter(QObject):
     async def _start(self):
         _qcanvas = await self._setup_database()
 
+        # TODO it might be more reliable to use self here!
         _main_window = QCanvasWindow(_qcanvas)
         _main_window.show()
         self.setParent(_main_window)
@@ -62,6 +63,7 @@ def run_setup():
     app.aboutToQuit.connect(app_close_event.set, Qt.ConnectionType.SingleShotConnection)
 
     setup_window = SetupDialog()
+    setup_window.rejected.connect(lambda: exit())
     setup_window.show()
 
     with event_loop:

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

@@ -56,7 +56,7 @@ class AssignmentTab(ContentTab):
 
         self._submission_files_pane = AttachmentsPane(downloader)
         self._submission_files_dock = ui.dock_widget(
-            title="Submission Files",
+            title="Submitted Files",
             name="sub_files_dock",
             widget=self._submission_files_pane,
             min_size=ui.size(150, 150),

qcanvas/ui/qcanvas_window/qcanvas_window.py

@@ -234,10 +234,14 @@ class QCanvasWindow(QMainWindow):
         opening_progress_dialog.setWindowTitle("Please wait")
         opening_progress_dialog.show()
 
-        open_url = QUrl(await self._qcanvas.canvas_client.get_temporary_session_url())
-        _logger.info(f"Opening URL {open_url}")
-        QDesktopServices.openUrl(open_url)
-        opening_progress_dialog.close()
+        try:
+            open_url = QUrl(
+                await self._qcanvas.canvas_client.get_temporary_session_url()
+            )
+            _logger.info(f"Opening URL {open_url}")
+            QDesktopServices.openUrl(open_url)
+        finally:
+            opening_progress_dialog.close()
 
     @Slot()
     def _open_downloads_folder(self) -> None:

qcanvas/ui/setup/setup_dialog.py

@@ -5,7 +5,7 @@ from typing import Optional
 from libqcanvas_clients.canvas import CanvasClient, CanvasClientConfig
 from libqcanvas_clients.panopto import PanoptoClient, PanoptoClientConfig
 from libqcanvas_clients.util.request_exceptions import ConfigInvalidError
-from PySide6.QtCore import Qt, QUrl, Signal, Slot
+from PySide6.QtCore import Qt, QUrl, Slot
 from PySide6.QtGui import QDesktopServices, QIcon
 from PySide6.QtWidgets import (
     QCheckBox,
@@ -96,8 +96,6 @@ class _InputRow:
 
 
 class SetupDialog(QDialog):
-    closed = Signal()
-
     def __init__(self):
         super().__init__()
 
@@ -289,8 +287,7 @@ class SetupDialog(QDialog):
 
         settings.client.canvas_api_key = self._canvas_api_key_box.text
 
-        self.closed.emit()
-        self.close()
+        self.accept()
 
     @Slot()
     def _help_requested(self) -> None:

{qcanvas-2.0.4.dist-info → qcanvas-2.0.6.dist-info}/METADATA

@@ -1,12 +1,35 @@
 Metadata-Version: 2.3
 Name: qcanvas
-Version: 2.0.4
+Version: 2.0.6
 Summary: View courses from Canvas LMS
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
 Requires-Python: >=3.12,<3.13
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: X11 Applications
+Classifier: Environment :: X11 Applications :: Qt
+Classifier: Framework :: Pydantic
+Classifier: Framework :: Pydantic :: 2
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Classifier: Natural Language :: English
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: Microsoft :: Windows :: Windows 10
+Classifier: Operating System :: Microsoft :: Windows :: Windows 11
+Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Database
+Classifier: Topic :: Internet
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Text Editors :: Text Processing
+Classifier: Topic :: Text Processing :: Markup :: HTML
+Classifier: Typing :: Typed
 Requires-Dist: aiofile (>=3.9.0,<4.0.0)
 Requires-Dist: aiosqlite (>=0.21.0,<0.22.0)
 Requires-Dist: asynctaskpool (>=0.2.1,<0.3.0)

{qcanvas-2.0.4.dist-info → qcanvas-2.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
-qcanvas/__init__.py,sha256=r_xv_WzpWlX3v67iZHXjjEY42_oKDxTLwEmI9ttvHco,1719
-qcanvas/app.py,sha256=NNxjdzFtRaeGk0cSOHKepwK7ONvHwmY_RcW0IVVzoIs,2747
+qcanvas/__init__.py,sha256=J4gpVRrBBlMqeqyXPZj0uLc6g-0UCYgoQc72f8LjDks,1946
+qcanvas/app.py,sha256=6oiksoNColxL6YJ9gjsnJxLLE9qy0AmzUIPc-4cU348,2856
 qcanvas/backend_connectors/__init__.py,sha256=Wj8cmxQng3SSlmlXJyzHaPmvxbkauwsxINckPb7WuHc,108
 qcanvas/backend_connectors/frontend_resource_manager.py,sha256=uzi8z2bNBdQoVkvtwxWo4qX5r0s13qmH5QL2t0vD0d8,1613
 qcanvas/backend_connectors/qcanvas_task_master.py,sha256=G46WgM4LA9VGWUDe3cBfRqHEYrOqcM70UJ5ipwc8hm0,740
@@ -22,7 +22,7 @@ qcanvas/ui/course_viewer/course_tree/course_tree.py,sha256=KaPVdvS2tPdMZFhggWCvg
 qcanvas/ui/course_viewer/course_viewer.py,sha256=AGZ6eQlRLb1i2ex-gbe2ygT3_sHYD7bvXy3tYQ2Jugc,4974
 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=HAy6SsPTC-FpaaTWELS7lc5rgkB3Wm0m3DIHb3cvaaI,4850
+qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py,sha256=VJLs2BwgQSPM_3nB2iNAbHqRbkIxz04ejSzh3otmnqs,4849
 qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py,sha256=Lwj3Sq_W_XFV240VpLK6W3kIUQ00NH9qB88mAKsYHNs,2908
 qcanvas/ui/course_viewer/tabs/constants.py,sha256=rUVEGSREV9vTFs4o3AD2OjaSFA-GPsmelxYWz0J8OP4,48
 qcanvas/ui/course_viewer/tabs/content_tab.py,sha256=l2h1Vl7t0GAFYXzEjihMzpBv596sOu8BJKiMz1lcFAE,3274
@@ -49,7 +49,7 @@ qcanvas/ui/qcanvas_window/options/auto_download_resources_option.py,sha256=oeVdU
 qcanvas/ui/qcanvas_window/options/quick_sync_option.py,sha256=16zEFL__JRi-wE7Q99_Bqi-OHEBhRgf5QlnVUOUX3Eg,833
 qcanvas/ui/qcanvas_window/options/sync_on_start_option.py,sha256=gL_FIulULN1uGBJJWgUszyjayQDw5WfppjoErbM3850,773
 qcanvas/ui/qcanvas_window/options/theme_selection_menu.py,sha256=VMx79H45R7lcpMFpaN8eohbCxkQkq43MdH8W0nt2aTQ,1434
-qcanvas/ui/qcanvas_window/qcanvas_window.py,sha256=VDgoBpldNAu_7Rj4BqT7KQOgcBN1Koq6c0s0uduumc8,8945
+qcanvas/ui/qcanvas_window/qcanvas_window.py,sha256=VaIx3HE0HkC4NE1BNOh8k-Tu-8zQif4KJ5w9vEOlImY,9021
 qcanvas/ui/qcanvas_window/status_bar_progress_display.py,sha256=v8cL7EzhKIO6YDo-IJGC2TvjnaHvHb9F2VyJtW0W4U8,5047
 qcanvas/ui/qml_components/__init__.py,sha256=_qCJGhqDvxx8k4dIDgLFpKU7z-R7AS6HWPlsrUlAj2Q,203
 qcanvas/ui/qml_components/attachments_pane.py,sha256=uzaMguTCOAdorU0t4UUkjSOjeY0rYEO3h9lMskLr4Ow,2352
@@ -72,7 +72,7 @@ qcanvas/ui/qml_components/qml_bridge_types.py,sha256=iHyG9ACG7bj8X_fty4Qpd5oSTmc
 qcanvas/ui/qml_components/qml_pane.py,sha256=g4TDiWuZZ0eZ6rWagFJG4nE8aYXqS6cDl_UvjDBJi-Y,699
 qcanvas/ui/setup/__init__.py,sha256=QWt2lEyLqWG5QC-BmCBlYyi0LZsBfsQYbP0XkvqA2f8,77
 qcanvas/ui/setup/setup_checker.py,sha256=gU70geojUyOTW_fNgH-GzpTMrtYXsLHWf2wUnFaezmA,444
-qcanvas/ui/setup/setup_dialog.py,sha256=_-52R6B8UIpKWRQ5jqpypgJLdnm_aXrZ5cKtyAXq0JA,10730
+qcanvas/ui/setup/setup_dialog.py,sha256=RDZkxzUaTY3qfta6YmHDK9VHEa4_0sJSMHU1cRGJSso,10673
 qcanvas/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/util/auto_downloader.py,sha256=DO2TCNQ2idUoITqlxxAp1tY8C5Zy52nghjCE4hv49aw,1905
 qcanvas/util/basic_fonts.py,sha256=TqaY2UchDseHDZYB-Bh6r3xRoRuc5S9lf8j-fMGGCYQ,249
@@ -86,7 +86,7 @@ qcanvas/util/qurl_util.py,sha256=6nTk8VkQjT87wMOXyZucPBYdT6TTYzfCTElqsypLZPg,200
 qcanvas/util/runtime.py,sha256=EO1HFCN7dZbQtKHQOILuvjZFXGT7SzhlmPvU8ma95Z8,617
 qcanvas/util/ui_tools.py,sha256=cdwDrtljxIpzikvUt4CAMC06kogJ4WfhSTsC3lXAcz4,3575
 qcanvas/util/url_checker.py,sha256=HkNFixp1ARwc_YjYkpHb-IMTyuaC7CylvYCgDyo3sh4,136
-qcanvas-2.0.4.dist-info/METADATA,sha256=3V9Y4Xv7aMPBf2GjXTXnjfxHlJjSwJIozwMnneB79LY,1969
-qcanvas-2.0.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-qcanvas-2.0.4.dist-info/entry_points.txt,sha256=hqG_g3MRYh_eLyQcDN4H3EXqmBia_fnJTJ-3nqZGzvY,40
-qcanvas-2.0.4.dist-info/RECORD,,
+qcanvas-2.0.6.dist-info/METADATA,sha256=0swKAXWUoRPJqxELXMBBQ0mlGu5ci647m87HcyA8IkE,3092
+qcanvas-2.0.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+qcanvas-2.0.6.dist-info/entry_points.txt,sha256=hqG_g3MRYh_eLyQcDN4H3EXqmBia_fnJTJ-3nqZGzvY,40
+qcanvas-2.0.6.dist-info/RECORD,,

{qcanvas-2.0.4.dist-info → qcanvas-2.0.6.dist-info}/WHEEL

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