Merge pull request #282 from NTFSvolume/simplify_log_messages

refactor: only log "download finished" if the download was successful
jbsparrow · Nov 14, 2024 · 0e97937 · 0e97937
2 parents 258d78e + 9a35756
commit 0e97937
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/cyberdrop_dl/downloader/downloader.py b/cyberdrop_dl/downloader/downloader.py
@@ -144,8 +144,6 @@ async def run(self, media_item: MediaItem) -> None:
                     log(f"{self.log_prefix} failed: {media_item.url} with error {e}", 40, exc_info=True)
                     self.manager.progress_manager.download_stats_progress.add_failure("Unknown")
                     self.manager.progress_manager.download_progress.add_failed()
-                else:
-                    log(f"{self.log_prefix} finished: {media_item.url}", 20)
                 finally:
                     await self._file_lock.release_lock(media_item.file_lock_reference_name)
         self._semaphore.release()
@@ -195,6 +193,7 @@ async def download(self, media_item: MediaItem) -> None:
                 self.set_file_datetime(media_item, media_item.complete_file)
                 self.attempt_task_removal(media_item)
                 self.manager.progress_manager.download_progress.add_completed()
+                log(f"Download finished: {media_item.url}", 20)
 
         except RestrictedFiletypeError:
             self.manager.progress_manager.download_progress.add_skipped()

diff --git a/cyberdrop_dl/scraper/crawler.py b/cyberdrop_dl/scraper/crawler.py
@@ -66,10 +66,9 @@ async def run(self, item: ScrapeItem) -> None:
         await self._lock.acquire()
         self.waiting_items -= 1
         if item.url.path_qs not in self.scraped_items:
-            log(f"Scrape Starting: {item.url}", 20)
+            log(f"Scraping: {item.url}", 20)
             self.scraped_items.append(item.url.path_qs)
             await self.fetch(item)
-            log(f"Scrape Finished: {item.url}", 20)
         else:
             log(f"Skipping {item.url} as it has already been scraped", 10)
         self._lock.release()

diff --git a/cyberdrop_dl/utils/utilities.py b/cyberdrop_dl/utils/utilities.py
@@ -38,7 +38,7 @@ async def wrapper(self: Crawler, *args, **kwargs):
             return await func(self, *args, **kwargs)
         except CDLBaseError as e:
             log_message_short = e_ui_failure = e.ui_message
-            log_message = e.message
+            log_message = f"{e.ui_message} - {e.message}" if e.ui_message != e.message else e.message
             origin = e.origin
         except RealDebridError as e:
             log_message_short = log_message = f"RealDebridError - {e.error}"