nas/Auto_Bangumi
1
0
Fork 0
mirror of https://github.com/EstrellaXD/Auto_Bangumi.git synced 2026-04-13 16:49:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #236 from EstrellaXD/2.6-dev

Browse Source 
2.6.8
This commit is contained in:
Estrella Pan
2023-05-05 15:19:02 +08:00
committed by GitHub
parent 8c00bee111 6cd7805d4f
commit 4c471ddd4d
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/module/manager/renamer.py
View File

@@ -43,7 +43,7 @@ class Renamer:
subtitle_list.append(file_name)
return media_list, subtitle_list
def rename_file(self, info, media_path: str, rename_method: str, bangumi_name: str, season: int, remove_bad_torrents: bool):
def rename_file(self, info, media_path: str, method: str, bangumi_name: str, season: int, remove_bad_torrents: bool):
torrent_name = info.name
suffix = os.path.splitext(media_path)[-1]
compare_name = self.get_file_name(media_path)
@@ -52,7 +52,7 @@ class Renamer:
bangumi_name=bangumi_name,
season=season,
suffix=suffix,
method=rename_method
method=method
)
if compare_name != new_path:
try:
@@ -65,19 +65,19 @@ class Renamer:
# Delete bad torrent
self.delete_bad_torrent(info, remove_bad_torrents)
def rename_collection(self, info, media_list: list[str],bangumi_name: str, season: int, remove_bad_torrents: bool):
def rename_collection(self, info, media_list: list[str], bangumi_name: str, season: int, remove_bad_torrents: bool, method: str):
_hash = info.hash
for media_path in media_list:
path_len = len(media_path.split(os.path.sep))
if path_len <= 2:
suffix = os.path.splitext(media_path)[-1]
torrent_name = self.get_file_name(media_path)
new_name, episode = self._renamer.torrent_parser(
new_name = self._renamer.torrent_parser(
torrent_name=torrent_name,
bangumi_name=bangumi_name,
season=season,
suffix=suffix,
method="pn"
method=method
)
if torrent_name != new_name:
try:
@@ -167,7 +167,7 @@ class Renamer:
self.rename_file(
info=info,
media_path=media_list[0],
rename_method=rename_method,
method=rename_method,
bangumi_name=bangumi_name,
season=season,
remove_bad_torrents=remove_bad_torrents
@@ -183,11 +183,12 @@ class Renamer:
elif len(media_list) > 1:
logger.info("Start rename collection")
self.rename_collection(
info,
media_list,
bangumi_name,
season,
remove_bad_torrents
info=info,
media_list=media_list,
bangumi_name=bangumi_name,
season=season,
remove_bad_torrents=remove_bad_torrents,
method=rename_method
)
if len(subtitle_list) > 0:
self.rename_subtitles(

15
src/test/test_torrent_parser.py
View File

@@ -44,3 +44,18 @@ def test_torrent_parser():
suffix = ".mp4"
assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "海盗战记 S01E01.mp4"
assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "海盗战记(2021) S01E01.mp4"
file_name = "海盗战记 S01E01.zh-tw.ass"
folder_name = "海盗战记(2021)"
season = 1
suffix = ".ass"
assert torrent_parser(file_name, folder_name, season, suffix, "subtitle_pn") == "海盗战记 S01E01.zh-tw.ass"
assert torrent_parser(file_name, folder_name, season, suffix, "subtitle_advance") == "海盗战记(2021) S01E01.zh-tw.ass"
file_name = "海盗战记 S01E01.SC.ass"
folder_name = "海盗战记(2021)"
season = 1
suffix = ".ass"
assert torrent_parser(file_name, folder_name, season, suffix, "subtitle_pn") == "海盗战记 S01E01.zh.ass"
assert torrent_parser(file_name, folder_name, season, suffix, "subtitle_advance") == "海盗战记(2021) S01E01.zh.ass"