Skip to content

Commit fb08de6

Browse files
committed
feat: 콜백 메시지 조정
1 parent 5ffe895 commit fb08de6

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

WebtoonScraper/scrapers/_scraper.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -724,13 +724,13 @@ async def _download_episodes(self, download_range: RangeType, webtoon_directory:
724724
if episode_no in self.skip_download:
725725
reason = "skipped_by_skip_download"
726726
description = "because the episode is included in skip_download"
727-
await self._episode_skipped(reason, description, episode_no=episode_no, short_ep_title=_shorten(self.episode_titles[episode_no] or "unknown episode"))
727+
await self._episode_skipped(reason, description, level="debug", episode_no=episode_no, short_ep_title=_shorten(self.episode_titles[episode_no] or "unknown episode"))
728728
continue
729729
# download_range는 1-based indexing이니 조정이 필요함
730730
if download_range is not None and episode_no + 1 not in download_range:
731731
reason = "skipped_by_range"
732732
description = "because of the set range"
733-
await self._episode_skipped(reason, description, episode_no=episode_no, short_ep_title=_shorten(self.episode_titles[episode_no] or "unknown episode"))
733+
await self._episode_skipped(reason, description, level="debug", episode_no=episode_no, short_ep_title=_shorten(self.episode_titles[episode_no] or "unknown episode"))
734734
continue
735735

736736
await self._download_episode(episode_no, webtoon_directory)
@@ -742,7 +742,7 @@ async def _download_episodes(self, download_range: RangeType, webtoon_directory:
742742
else:
743743
self.progress.stop()
744744

745-
async def _episode_skipped(self, reason: DownloadStatus, description: str, *, no_progress: bool = False, episode_no, **context):
745+
async def _episode_skipped(self, reason: DownloadStatus, description: str, *, no_progress: bool = False, episode_no, level: LogLevel = "info", **context):
746746
"""에피소드 다운로드를 건너뛸 때 사용하는 콜백입니다."""
747747
if (ep_title := self.episode_titles[episode_no]) is None:
748748
short_ep_title = f"#{episode_no + 1}"
@@ -769,7 +769,7 @@ async def _episode_skipped(self, reason: DownloadStatus, description: str, *, no
769769
"download_skipped",
770770
_crate_callback(
771771
msg_format,
772-
level="debug",
772+
level=level,
773773
),
774774
**context,
775775
)
@@ -779,16 +779,16 @@ async def _episode_skipped(self, reason: DownloadStatus, description: str, *, no
779779
_crate_callback(
780780
msg_format,
781781
progress_update="{short_ep_title} skipped",
782-
level="debug",
782+
level=level,
783783
),
784784
**context,
785785
)
786786

787787
async def _download_episode(self, episode_no: int, webtoon_directory: Path) -> None:
788788
episode_title = self.episode_titles[episode_no]
789-
context: dict = dict(episode_no=episode_no, short_ep_title=episode_title and _shorten(episode_title))
789+
context: dict = dict(episode_no=episode_no, episode_no1=episode_no, short_ep_title=episode_title and _shorten(episode_title), total_ep=len(self.episode_ids))
790790
if episode_title is None:
791-
return await self._episode_skipped("not_downloadable", "because the episode has empty title", no_progress=True, **context)
791+
return await self._episode_skipped("not_downloadable", "because the episode has empty title", level="debug", no_progress=True, **context)
792792
now = datetime.now()
793793
directory_name = self._safe_name(
794794
self._episode_directory_format.format(
@@ -894,7 +894,7 @@ async def _download_episode(self, episode_no: int, webtoon_directory: Path) -> N
894894

895895
# send done callback message
896896
self.download_status[episode_no] = "downloaded"
897-
await self.async_callback("download_completed", _crate_callback(progress_update="{short_ep_title} downloaded"), **context)
897+
await self.async_callback("download_completed", _crate_callback("[{total_ep}/{episode_no1}] {short_ep_title!r} downloaded", progress_update="{short_ep_title} downloaded"), **context)
898898

899899
async def _download_episode_images(self, episode_no: int, image_urls: list[str], episode_directory: Path) -> None:
900900
async with asyncio.TaskGroup() as group:

0 commit comments

Comments
 (0)