bacow/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #759 番号提取更新

Browse Source 
一些改动
This commit is contained in:
Yoshiko2
2022-04-13 20:03:35 +08:00
committed by GitHub
parent 3bcaf8d318 fee5c4a54f
commit 828635e421
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core.py
View File

@@ -526,6 +526,8 @@ def paste_file_to_folder(filepath, path, multi_part, number, part, leak_word, c_
if subfile.is_file() and subfile.suffix.lower() in sub_res: if subfile.is_file() and subfile.suffix.lower() in sub_res:
if multi_part and part.lower() not in subfile.name.lower(): if multi_part and part.lower() not in subfile.name.lower():
continue continue
if filepath_obj.stem.split('.')[0].lower() != subfile.stem.split('.')[0].lower():
continue
sub_targetpath = Path(path) / f"{number}{leak_word}{c_word}{hack_word}{''.join(subfile.suffixes)}" sub_targetpath = Path(path) / f"{number}{leak_word}{c_word}{hack_word}{''.join(subfile.suffixes)}"
if link_mode not in (1, 2): if link_mode not in (1, 2):
shutil.move(str(subfile), str(sub_targetpath)) shutil.move(str(subfile), str(sub_targetpath))
@@ -628,14 +630,14 @@ def core_main_no_net_op(movie_path, number):
imagecut = 1 imagecut = 1
path = str(Path(movie_path).parent) path = str(Path(movie_path).parent)
if re.search('-CD\d+', movie_path, re.IGNORECASE): if re.search('[-_]CD\d+', movie_path, re.IGNORECASE):
part = re.findall('-CD\d+', movie_path, re.IGNORECASE)[0].upper() part = re.findall('[-_]CD\d+', movie_path, re.IGNORECASE)[0].upper()
if re.search(r'-C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path, if re.search(r'[-_]C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path,
re.I) or '中文' in movie_path or '字幕' in movie_path: re.I) or '中文' in movie_path or '字幕' in movie_path:
cn_sub = '1' cn_sub = '1'
c_word = '-C' # 中文字幕影片后缀 c_word = '-C' # 中文字幕影片后缀
uncensored = 1 if is_uncensored(number) else 0 uncensored = 1 if is_uncensored(number) else 0
if '流出' in movie_path or 'uncensored' in movie_path: if '流出' in movie_path or 'uncensored' in movie_path.lower():
leak_word = '-流出' # 流出影片后缀 leak_word = '-流出' # 流出影片后缀
leak = 1 leak = 1
@@ -698,10 +700,10 @@ def core_main(movie_path, number_th, oCC):
imagecut = json_data.get('imagecut') imagecut = json_data.get('imagecut')
tag = json_data.get('tag') tag = json_data.get('tag')
# =======================================================================判断-C,-CD后缀 # =======================================================================判断-C,-CD后缀
if re.search('-CD\d+', movie_path, re.IGNORECASE): if re.search('[-_]CD\d+', movie_path, re.IGNORECASE):
multi_part = 1 multi_part = 1
part = re.findall('-CD\d+', movie_path, re.IGNORECASE)[0].upper() part = re.findall('[-_]CD\d+', movie_path, re.IGNORECASE)[0].upper()
if re.search(r'-C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path, if re.search(r'[-_]C(\.\w+$|-\w+)|\d+ch(\.\w+$|-\w+)', movie_path,
re.I) or '中文' in movie_path or '字幕' in movie_path: re.I) or '中文' in movie_path or '字幕' in movie_path:
cn_sub = '1' cn_sub = '1'
c_word = '-C' # 中文字幕影片后缀 c_word = '-C' # 中文字幕影片后缀
@@ -712,7 +714,7 @@ def core_main(movie_path, number_th, oCC):
if type(unce) is bool: if type(unce) is bool:
uncensored = 1 if unce else 0 uncensored = 1 if unce else 0
if '流出' in movie_path or 'uncensored' in movie_path: if '流出' in movie_path or 'uncensored' in movie_path.lower():
liuchu = '流出' liuchu = '流出'
leak = 1 leak = 1
leak_word = '-流出' # 流出影片后缀 leak_word = '-流出' # 流出影片后缀

2
number_parser.py
View File

@@ -7,7 +7,7 @@ import typing
G_spat = re.compile( G_spat = re.compile(
"^\w+\.(cc|com|net|me|club|jp|tv|xyz|biz|wiki|info|tw|us|de)@|^22-sht\.me|" "^\w+\.(cc|com|net|me|club|jp|tv|xyz|biz|wiki|info|tw|us|de)@|^22-sht\.me|"
"^(fhd|hd|sd|1080p|720p|4K)(-|_)|" "^(fhd|hd|sd|1080p|720p|4K)(-|_)|"
"(-|_)(fhd|hd|sd|1080p|720p|4K|uncensored|leak)", "(-|_)(fhd|hd|sd|1080p|720p|4K|x264|x265|uncensored|leak)",
re.IGNORECASE) re.IGNORECASE)