From 9ddc4331749b7d155886f87e0ec91d046fcd6496 Mon Sep 17 00:00:00 2001 From: Taras Terletskyi <888784+tropicoo@users.noreply.github.com> Date: Tue, 4 Apr 2023 22:14:41 +0300 Subject: [PATCH] Maintenance --- app_worker/worker/core/media_service.py | 6 ++---- yt_shared/yt_shared/schemas/media.py | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app_worker/worker/core/media_service.py b/app_worker/worker/core/media_service.py index 158f2e4..8214c27 100644 --- a/app_worker/worker/core/media_service.py +++ b/app_worker/worker/core/media_service.py @@ -183,8 +183,7 @@ class MediaService: dst = os.path.join(settings.STORAGE_PATH, file.filename) self._log.info('Copying "%s" to storage "%s"', file.filepath, dst) await asyncio.to_thread(shutil.copy2, file.filepath, dst) - file.saved_to_storage = True - file.storage_path = dst + file.mark_as_saved_to_storage(storage_path=dst) def _err_file_cleanup(self, video: DownMedia) -> None: """Cleanup any downloaded/created data if post-processing failed.""" @@ -194,5 +193,4 @@ class MediaService: async def _handle_download_exception( self, err: Exception, task: Task, db: AsyncSession ) -> None: - exception_msg = str(err) - await self._repository.save_as_failed(db, task, exception_msg) + await self._repository.save_as_failed(db=db, task=task, error_message=str(err)) diff --git a/yt_shared/yt_shared/schemas/media.py b/yt_shared/yt_shared/schemas/media.py index 3f25069..9372ac5 100644 --- a/yt_shared/yt_shared/schemas/media.py +++ b/yt_shared/yt_shared/schemas/media.py @@ -48,6 +48,10 @@ class BaseMedia(RealBaseModel): def file_size_human(self) -> str: return format_bytes(num=self.file_size) + def mark_as_saved_to_storage(self, storage_path: str) -> None: + self.storage_path = storage_path + self.saved_to_storage = True + class Audio(BaseMedia): """Model representing downloaded audio file."""