Skip to content

Commit a0d540c

Browse files
CopilotSigureMo
andcommitted
Rename bilibili_typing module to media and start_downloader to process_download
Co-authored-by: SigureMo <38436475+SigureMo@users.noreply.github.com>
1 parent 09b0bfd commit a0d540c

File tree

13 files changed

+15
-15
lines changed

13 files changed

+15
-15
lines changed

src/yutto/_typing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
if TYPE_CHECKING:
66
from pathlib import Path
77

8-
from yutto.bilibili_typing.codec import AudioCodec, VideoCodec
9-
from yutto.bilibili_typing.quality import AudioQuality, VideoQuality
8+
from yutto.media.codec import AudioCodec, VideoCodec
9+
from yutto.media.quality import AudioQuality, VideoQuality
1010
from yutto.utils.danmaku import DanmakuData, DanmakuOptions, DanmakuSaveType
1111
from yutto.utils.metadata import ChapterInfoData, MetaData
1212
from yutto.utils.subtitle import SubtitleData

src/yutto/api/bangumi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
VideoUrlMeta,
1616
format_ids,
1717
)
18-
from yutto.bilibili_typing.codec import audio_codec_map, video_codec_map
1918
from yutto.exceptions import NoAccessPermissionError, UnSupportedTypeError
19+
from yutto.media.codec import audio_codec_map, video_codec_map
2020
from yutto.utils.console.logger import Logger
2121
from yutto.utils.fetcher import Fetcher, FetcherContext
2222
from yutto.utils.funcutils import data_has_chained_keys

src/yutto/api/cheese.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
VideoUrlMeta,
1414
format_ids,
1515
)
16-
from yutto.bilibili_typing.codec import audio_codec_map, video_codec_map
1716
from yutto.exceptions import NoAccessPermissionError, UnSupportedTypeError
17+
from yutto.media.codec import audio_codec_map, video_codec_map
1818
from yutto.utils.console.logger import Logger
1919
from yutto.utils.fetcher import Fetcher, FetcherContext
2020
from yutto.utils.funcutils import data_has_chained_keys

src/yutto/api/ugc_video.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
VideoUrlMeta,
1515
format_ids,
1616
)
17-
from yutto.bilibili_typing.codec import audio_codec_map, video_codec_map
1817
from yutto.exceptions import (
1918
NoAccessPermissionError,
2019
NotFoundError,
2120
UnSupportedTypeError,
2221
)
22+
from yutto.media.codec import audio_codec_map, video_codec_map
2323
from yutto.utils.console.logger import Logger
2424
from yutto.utils.fetcher import Fetcher, FetcherContext
2525
from yutto.utils.funcutils.data_access import data_has_chained_keys

src/yutto/cli/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from typing import TYPE_CHECKING, Any, Literal
55

66
from yutto.__version__ import VERSION as yutto_version
7-
from yutto.bilibili_typing.quality import (
7+
from yutto.cli.settings import YuttoSettings, load_settings_file, search_for_settings_file
8+
from yutto.media.quality import (
89
audio_quality_priority_default,
910
video_quality_priority_default,
1011
)
11-
from yutto.cli.settings import YuttoSettings, load_settings_file, search_for_settings_file
1212
from yutto.parser import alias_parser, path_from_cli
1313
from yutto.utils.console.logger import Logger
1414
from yutto.utils.funcutils.functional import map_optional

src/yutto/cli/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from pydantic import BaseModel, Field
1010

11-
from yutto.bilibili_typing.quality import (
11+
from yutto.media.quality import (
1212
AudioQuality,
1313
VideoQuality,
1414
)

src/yutto/download_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from returns.maybe import Maybe, Nothing, Some
1414

1515
from yutto._typing import EpisodeData, ExtractorOptions
16-
from yutto.downloader.downloader import DownloadState, start_downloader
16+
from yutto.downloader.downloader import DownloadState, process_download
1717
from yutto.exceptions import ErrorCode
1818
from yutto.extractor import (
1919
BangumiBatchExtractor,
@@ -224,7 +224,7 @@ async def process_task(self, client: AsyncClient, ctx: FetcherContext, task: Dow
224224
Badge(f"[{i + 1}/{len(download_list)}]", fore="black", back="cyan"),
225225
)
226226

227-
current_download_state = await start_downloader(
227+
current_download_state = await process_download(
228228
ctx,
229229
client,
230230
episode_data,

src/yutto/downloader/downloader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from enum import Enum
77
from typing import TYPE_CHECKING
88

9-
from yutto.bilibili_typing.quality import audio_quality_map, video_quality_map
109
from yutto.downloader.progressbar import show_progress
1110
from yutto.downloader.selector import select_audio, select_video
11+
from yutto.media.quality import audio_quality_map, video_quality_map
1212
from yutto.utils.asynclib import CoroutineWrapper, first_successful_with_check
1313
from yutto.utils.console.colorful import colored_string
1414
from yutto.utils.console.logger import Badge, Logger
@@ -287,7 +287,7 @@ class DownloadState(Enum):
287287
SKIP = 1
288288

289289

290-
async def start_downloader(
290+
async def process_download(
291291
ctx: FetcherContext,
292292
client: httpx.AsyncClient,
293293
episode_data: EpisodeData,

src/yutto/downloader/selector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
from typing import TYPE_CHECKING
44

5-
from yutto.bilibili_typing.codec import (
5+
from yutto.media.codec import (
66
AudioCodec,
77
VideoCodec,
88
gen_acodec_priority,
99
gen_vcodec_priority,
1010
)
11-
from yutto.bilibili_typing.quality import (
11+
from yutto.media.quality import (
1212
AudioQuality,
1313
VideoQuality,
1414
gen_audio_quality_priority,
File renamed without changes.

0 commit comments

Comments
 (0)