Skip to content

Commit d061632

Browse files
committed
fix: is_child
1 parent 6ee0589 commit d061632

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

renamer.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os.path
22
import re
33
import sys
4-
from zipfile import ZipFile
4+
from zipfile import ZipFile, Path
55

66
import config
77
from peashooter.client import PeashooterClient
@@ -53,15 +53,11 @@ def is_tc(filename):
5353
return match is not None
5454

5555

56-
def is_child(filename):
56+
def is_child(zipfile, filename):
5757
"""
5858
是子目录下的文件
5959
"""
60-
try:
61-
filename.index('/')
62-
return True
63-
except ValueError:
64-
return False
60+
Path(root=zipfile, at=filename).parent.exists()
6561

6662

6763
def array_fill(two_dimension_list):
@@ -142,9 +138,10 @@ def rename(series_id, season, zip_file_path, drive):
142138
# 解压缩
143139
with ZipFile(zip_file_path) as zip_file:
144140
item_file_name_list = zip_file.namelist()
145-
item_file_name_list = list(filter(lambda item: not is_child(item) and not is_tc(item), item_file_name_list))
141+
item_file_name_list = list(filter(lambda item: not is_child(zip_file, item) and not is_tc(item),
142+
item_file_name_list))
146143
if len(item_file_name_list) == 0:
147-
item_file_name_list = list(filter(lambda item: not is_child(item), zip_file.namelist()))
144+
item_file_name_list = list(filter(lambda item: not is_child(zip_file, item), zip_file.namelist()))
148145
item_file_name_list.sort()
149146
subtitle_file_type_list = get_subtitle_file_type_list(item_file_name_list)
150147
filename_episode_num_map = get_filename_episode_num_map(item_file_name_list)

0 commit comments

Comments
 (0)