Avoid filename conflicts with content and attachments, handle oserror (…

…#385)

* Handle OSError in download thread gracefully

* Assign a extension based on mimetype to all attachments

* Replace dots in content directories

blackboard_sync/content/attachment.py

@@ -1,4 +1,5 @@
 import uuid
+import mimetypes
 
 from pathlib import Path
 from concurrent.futures import ThreadPoolExecutor
@@ -15,10 +16,21 @@ class Attachment(BStream):
 
     def __init__(self, attachment: BBAttachment, api_path: BBContentPath,
                  job: DownloadJob):
-        self.filename = attachment.fileName
+        filename = attachment.fileName or str(uuid.uuid1())
+        name_ext = '.' + filename.split('.')[-1]
+
+        # Guess extension based on content
+        mime = attachment.mimeType or 'text/plain'
+        real_ext = mimetypes.guess_extension(mime, strict=False)
+        possible_ext = mimetypes.guess_all_extensions(mime, strict=False)
+
+        if name_ext in possible_ext:
+            self.filename = filename
+        else:
+            self.filename = filename + real_ext
+
         self.stream = job.session.download(attachment_id=attachment.id,
                                            **api_path)
 
     def write(self, path: Path, executor: ThreadPoolExecutor) -> None:
-        filename = self.filename or str(uuid.uuid1())
-        super().write_base(path / filename, executor, self.stream)
+        super().write_base(path / self.filename, executor, self.stream)

blackboard_sync/content/content.py

@@ -38,7 +38,7 @@ def __init__(self, content: BBCourseContent, api_path: BBContentPath,
 
         Handler = Content.get_handler(content.contentHandler)
 
-        self.title = content.title_path_safe
+        self.title = content.title_path_safe.replace('.', '_')
 
         try:
             self.handler = Handler(content, api_path, job)

blackboard_sync/sync.py

@@ -154,8 +154,8 @@ def download(self) -> datetime | None:
         except BBUnauthorizedError:
             logger.exception("User session expired")
             self.log_out()
-        except RequestException:
-            logger.exception("Network failure")
+        except (RequestException, OSError):
+            logger.exception("Download error")
             self._has_error = True
 
             # manually postpone next sync job