qcanvas 0.0.3.1a0__tar.gz → 0.0.3.2a0__tar.gz

{qcanvas-0.0.3.1a0 → qcanvas-0.0.3.2a0}/.gitignore

@@ -5,4 +5,4 @@ dist
 build
 __main__.spec
 .venv
-.system_pyside
+.system_pyside

{qcanvas-0.0.3.1a0 → qcanvas-0.0.3.2a0}/PKG-INFO

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

{qcanvas-0.0.3.1a0 → qcanvas-0.0.3.2a0}/pyproject.toml

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

{qcanvas-0.0.3.1a0 → qcanvas-0.0.3.2a0}/qcanvas/__main__.py

@@ -102,8 +102,7 @@ if __name__ == '__main__':
     asyncio.run(begin())
 
     app = QApplication(sys.argv)
-    c = app.palette().base().color()
-    print(f"{c.red()} {c.green()} {c.blue()}")
+
     qdarktheme.setup_theme("light",
                            custom_colors={"primary": "FF804F"}
     )

{qcanvas-0.0.3.1a0 → qcanvas-0.0.3.2a0}/qcanvas/db/database.py

@@ -1,5 +1,7 @@
+import os.path
 import pathlib
 import platform
+import re
 from datetime import datetime
 from enum import Enum
 from typing import List, Optional, MutableSequence
@@ -216,8 +218,13 @@ class Resource(MappedAsDataclass, Base, tree.HasText):
         if platform.system() == "Windows":
             file_id = file_id.replace(':', '$')
 
-        return pathlib.Path("download", f"{file_id}@{self.file_name}")
+        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"