From 6df12f8cab6ade921a87fd4d54731fdbf8e63aed Mon Sep 17 00:00:00 2001 From: NTFSvolume <172021377+NTFSvolume@users.noreply.github.com> Date: Wed, 13 Nov 2024 18:21:30 -0500 Subject: [PATCH 1/3] refactor: only show "Download finished" for successful downloads --- cyberdrop_dl/downloader/downloader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cyberdrop_dl/downloader/downloader.py b/cyberdrop_dl/downloader/downloader.py index 3ce321606..1b3b3c963 100644 --- 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() From a6700d9bf2e8c380cc7e23896d63ce4913db21b2 Mon Sep 17 00:00:00 2001 From: NTFSvolume <172021377+NTFSvolume@users.noreply.github.com> Date: Wed, 13 Nov 2024 18:22:21 -0500 Subject: [PATCH 2/3] refactor: more verbose log messages --- cyberdrop_dl/utils/utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cyberdrop_dl/utils/utilities.py b/cyberdrop_dl/utils/utilities.py index 8b7d41ed4..52e0e41db 100644 --- 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}" From 9a3575648a7d54cffffff6b42f6973a14d7cc40d Mon Sep 17 00:00:00 2001 From: NTFSvolume <172021377+NTFSvolume@users.noreply.github.com> Date: Wed, 13 Nov 2024 18:23:40 -0500 Subject: [PATCH 3/3] refactor: do not show "Scrape Finished" --- cyberdrop_dl/scraper/crawler.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cyberdrop_dl/scraper/crawler.py b/cyberdrop_dl/scraper/crawler.py index 423e71a1e..3b7c60d0e 100644 --- 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()