Skip to content

Commit 7190850

Browse files
committed
refactor: _webtoon_directory_format를 webtoon_dir_format으로 expose
1 parent 106d406 commit 7190850

3 files changed

Lines changed: 1245 additions & 8 deletions

File tree

WebtoonScraper/__main__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ async def parse_download(args: argparse.Namespace) -> None:
285285
scraper.use_progress_bar = False
286286

287287
if args.webtoon_dir_name:
288-
scraper._webtoon_directory_format = args.webtoon_dir_name
288+
scraper.webtoon_dir_format = args.webtoon_dir_name
289289
if args.episode_dir_name:
290-
scraper._episode_directory_format = args.episode_dir_name
290+
scraper.episode_dir_format = args.episode_dir_name
291291

292292
if hasattr(scraper, "thread_number"):
293293
scraper.thread_number = args.thread_number # type: ignore

WebtoonScraper/scrapers/_scraper.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ class Scraper(typing.Generic[WebtoonId]): # MARK: SCRAPER
170170
episode_titles=None,
171171
author=None,
172172
download_status="download_status",
173-
webtoon_dir_name="_webtoon_directory_format",
174-
episode_dir_name="_episode_directory_format",
173+
webtoon_dir_name="webtoon_dir_format",
174+
episode_dir_name="episode_dir_format",
175175
episode_dir_names=None,
176176
)
177177

@@ -227,8 +227,8 @@ def __init__(self, webtoon_id: WebtoonId) -> None:
227227
"""_tasks에 값을 등록해 두면 스크래퍼가 종료될 때 해당 task들을 완료하거나 취소합니다."""
228228
self._cookie_set = False
229229
"""쿠키가 사용자에 의해 변경되었는지를 검사합니다."""
230-
self._webtoon_directory_format: str = "{title}({identifier})"
231-
self._episode_directory_format: str = "{no:04d}. {episode_title}"
230+
self.webtoon_dir_format: str = "{title}({identifier})"
231+
self.episode_dir_format: str = "{no:04d}. {episode_title}"
232232

233233
def __init_subclass__(cls, register: bool = True, override: bool = False) -> None:
234234
if not register:
@@ -421,7 +421,7 @@ def from_url(cls, url: str) -> typing.Self:
421421
def get_webtoon_directory_name(self) -> str:
422422
"""웹툰 디렉토리의 이름을 결정합니다."""
423423
now = datetime.now()
424-
directory_name = self._webtoon_directory_format.format(
424+
directory_name = self.webtoon_dir_format.format(
425425
title=self.title,
426426
identifier=self._get_identifier(),
427427
webtoon_id=self.webtoon_id,
@@ -592,7 +592,7 @@ async def _download_episode(self, episode_no: int, context: dict) -> None:
592592
return await self._episode_skipped("not_downloadable", "because the episode has empty title", level="debug", no_progress=True, **context)
593593
now = datetime.now()
594594
directory_name = self._safe_name(
595-
self._episode_directory_format.format(
595+
self.episode_dir_format.format(
596596
no=episode_no + 1,
597597
no0=episode_no,
598598
episode_title=episode_title,

0 commit comments

Comments
 (0)