From ee4ea1170686ecdd273ae21bf27d0fadb4491512 Mon Sep 17 00:00:00 2001 From: todoXu Date: Thu, 7 Sep 2023 00:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=20-U=20=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=A0=B4=E8=A7=A3=20=20-UC=E5=8C=B9=E9=85=8D=20=E7=A0=B4?= =?UTF-8?q?=E8=A7=A3+=E5=AD=97=E5=B9=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core.py | 12 ++++++++++++ number_parser.py | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/core.py b/core.py index b643d16..0a9b4b6 100644 --- a/core.py +++ b/core.py @@ -872,6 +872,18 @@ def core_main(movie_path, number_th, oCC, specified_source=None, specified_url=N cn_sub = True c_word = '-C' # 中文字幕影片后缀 + if re.search(r'[-_]UC(\.\w+$|-\w+)', movie_path, + re.I): + cn_sub = True + c_word = '-UC' # + hack = True + hack_word = "-UC" + + if re.search(r'[-_]U(\.\w+$|-\w+)', movie_path, + re.I):# + hack = True + hack_word = "-U" + # 判断是否无码 unce = json_data.get('无码') uncensored = int(unce) if isinstance(unce, bool) else int(is_uncensored(number)) diff --git a/number_parser.py b/number_parser.py index d54d9a0..2cc03d2 100755 --- a/number_parser.py +++ b/number_parser.py @@ -73,10 +73,18 @@ def get_number(debug: bool, file_path: str) -> str: file_number = str(filename.group()) else: file_number = file_number[0] - file_number = re.sub("(-|_)c$", "", file_number, flags=re.IGNORECASE) - if re.search("\d+ch$", file_number, flags=re.I): - file_number = file_number[:-2] - return file_number.upper() + + new_file_number = file_number + if re.search("-c", file_number, flags=re.IGNORECASE): + new_file_number = re.sub("(-|_)c$", "", file_number, flags=re.IGNORECASE) + elif re.search("-u$", file_number, flags=re.IGNORECASE): + new_file_number = re.sub("(-|_)u$", "", file_number, flags=re.IGNORECASE) + elif re.search("-uc$", file_number, flags=re.IGNORECASE): + new_file_number = re.sub("(-|_)uc$", "", file_number, flags=re.IGNORECASE) + elif re.search("\d+ch$", file_number, flags=re.I): + new_file_number = file_number[:-2] + + return new_file_number.upper() else: # 提取不含减号-的番号,FANZA CID # 欧美番号匹配规则 oumei = re.search(r'[a-zA-Z]+\.\d{2}\.\d{2}\.\d{2}', filepath)