Skip to content

Commit d5de9b4

Browse files
CopilotSigureMo
andcommitted
fix: resolve CI import sorting errors and align CONTRIBUTING.md comments
Co-authored-by: SigureMo <38436475+SigureMo@users.noreply.github.com>
1 parent f35abe6 commit d5de9b4

20 files changed

+27
-27
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ uv run yutto -v
6767
│ ├── __init__.py
6868
│ ├── __main__.py # 命令行入口,含所有命令选项
6969
│ ├── __version__.py
70-
│ ├── types.py # yutto 的主要类型声明(非全部,部分类型是定义在自己模块之内的)
70+
│ ├── types.py # yutto 的主要类型声明(非全部,部分类型是定义在自己模块之内的)
7171
│ ├── api # bilibili API 的基本函数封装,输入输出转换为 yutto 的主要类型
7272
│ │ ├── __init__.py
7373
│ │ ├── bangumi.py # 番剧相关

src/yutto/api/bangumi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import re
44
from typing import TYPE_CHECKING, Any, TypedDict
55

6+
from yutto.exceptions import NoAccessPermissionError, UnSupportedTypeError
7+
from yutto.media.codec import audio_codec_map, video_codec_map
68
from yutto.types import (
79
AudioUrlMeta,
810
AvId,
@@ -15,8 +17,6 @@
1517
VideoUrlMeta,
1618
format_ids,
1719
)
18-
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.functional import data_has_chained_keys

src/yutto/api/cheese.py

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

33
from typing import TYPE_CHECKING, Any, TypedDict
44

5+
from yutto.exceptions import NoAccessPermissionError, UnSupportedTypeError
6+
from yutto.media.codec import audio_codec_map, video_codec_map
57
from yutto.types import (
68
AId,
79
AudioUrlMeta,
@@ -13,8 +15,6 @@
1315
VideoUrlMeta,
1416
format_ids,
1517
)
16-
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.functional import data_has_chained_keys

src/yutto/api/space.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import math
44
from typing import TYPE_CHECKING
55

6-
from yutto.types import AvId, BvId, FavouriteMetaData, FId, MId, SeriesId
76
from yutto.api.user_info import encode_wbi, get_wbi_img
87
from yutto.exceptions import NotLoginError
8+
from yutto.types import AvId, BvId, FavouriteMetaData, FId, MId, SeriesId
99
from yutto.utils.console.logger import Logger
1010
from yutto.utils.fetcher import Fetcher, FetcherContext
1111

src/yutto/api/ugc_video.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
import re
44
from typing import TYPE_CHECKING, Any, TypedDict, cast
55

6+
from yutto.exceptions import (
7+
NoAccessPermissionError,
8+
NotFoundError,
9+
UnSupportedTypeError,
10+
)
11+
from yutto.media.codec import audio_codec_map, video_codec_map
612
from yutto.types import (
713
AId,
814
AudioUrlMeta,
@@ -14,12 +20,6 @@
1420
VideoUrlMeta,
1521
format_ids,
1622
)
17-
from yutto.exceptions import (
18-
NoAccessPermissionError,
19-
NotFoundError,
20-
UnSupportedTypeError,
21-
)
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.functional.data_access import data_has_chained_keys

src/yutto/cli/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
from yutto.__version__ import VERSION as yutto_version
77
from yutto.cli.settings import YuttoSettings, load_settings_file, search_for_settings_file
8+
from yutto.input_parser import alias_parser, path_from_cli
89
from yutto.media.quality import (
910
audio_quality_priority_default,
1011
video_quality_priority_default,
1112
)
12-
from yutto.input_parser import alias_parser, path_from_cli
1313
from yutto.utils.console.logger import Logger
1414
from yutto.utils.functional.functional import map_optional
1515

src/yutto/download_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from httpx import AsyncClient
1313
from returns.maybe import Maybe, Nothing, Some
1414

15-
from yutto.types import EpisodeData, ExtractorOptions
1615
from yutto.downloader.downloader import DownloadState, process_download
1716
from yutto.exceptions import ErrorCode
1817
from yutto.extractor import (
@@ -30,6 +29,7 @@
3029
UserWatchLaterExtractor,
3130
)
3231
from yutto.path_templates import create_unique_path_resolver
32+
from yutto.types import EpisodeData, ExtractorOptions
3333
from yutto.utils.asynclib import sleep_with_status_bar_refresh
3434
from yutto.utils.console.logger import Badge, Logger
3535
from yutto.utils.danmaku import DanmakuOptions

src/yutto/extractor/bangumi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import sys
55
from typing import TYPE_CHECKING
66

7-
from yutto.types import EpisodeData, EpisodeId
87
from yutto.api.bangumi import get_bangumi_list, get_season_id_by_episode_id
98
from yutto.exceptions import (
109
ErrorCode,
@@ -15,6 +14,7 @@
1514
)
1615
from yutto.extractor._abc import SingleExtractor
1716
from yutto.extractor.common import extract_bangumi_data
17+
from yutto.types import EpisodeData, EpisodeId
1818
from yutto.utils.asynclib import CoroutineWrapper
1919
from yutto.utils.console.logger import Badge, Logger
2020

src/yutto/extractor/bangumi_batch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import re
44
from typing import TYPE_CHECKING, Any
55

6-
from yutto.types import EpisodeData, EpisodeId, MediaId, SeasonId
76
from yutto.api.bangumi import (
87
get_bangumi_list,
98
get_season_id_by_episode_id,
@@ -12,6 +11,7 @@
1211
from yutto.extractor._abc import BatchExtractor
1312
from yutto.extractor.common import extract_bangumi_data
1413
from yutto.input_parser import parse_episodes_selection
14+
from yutto.types import EpisodeData, EpisodeId, MediaId, SeasonId
1515
from yutto.utils.asynclib import CoroutineWrapper
1616
from yutto.utils.console.logger import Badge, Logger
1717

src/yutto/extractor/cheese.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import sys
55
from typing import TYPE_CHECKING
66

7-
from yutto.types import EpisodeData, EpisodeId
87
from yutto.api.cheese import get_cheese_list, get_season_id_by_episode_id
98
from yutto.exceptions import (
109
ErrorCode,
@@ -15,6 +14,7 @@
1514
)
1615
from yutto.extractor._abc import SingleExtractor
1716
from yutto.extractor.common import extract_cheese_data
17+
from yutto.types import EpisodeData, EpisodeId
1818
from yutto.utils.asynclib import CoroutineWrapper
1919
from yutto.utils.console.logger import Badge, Logger
2020

0 commit comments

Comments
 (0)