From e47c17a57f60a9840afde664ff180ac049c2ec23 Mon Sep 17 00:00:00 2001 From: lededev Date: Thu, 6 May 2021 05:31:36 +0800 Subject: [PATCH 1/3] add 10musume detect --- number_parser.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/number_parser.py b/number_parser.py index 5414890..7175d3d 100644 --- a/number_parser.py +++ b/number_parser.py @@ -46,6 +46,8 @@ def get_number(debug,filepath: str) -> str: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('_', '-') elif "1pon" in lower_check: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('-', '_') + elif "10mu" in lower_check: + file_number = str(re.search(r'\d{6}(-|_)\d{2}', lower_check, re.A).group()).replace('-', '_') return file_number else: # 提取不含减号-的番号，FANZA CID # 欧美番号匹配规则 @@ -78,6 +80,8 @@ def get_number(debug,filepath: str) -> str: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('_', '-') elif "1pon" in lower_check: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('-', '_') + elif "10mu" in lower_check: + file_number = str(re.search(r'\d{6}(-|_)\d{2}', lower_check, re.A).group()).replace('-', '_') return file_number else: # 提取不含减号-的番号，FANZA CID # 欧美番号匹配规则 From f3ffb5753f7570131c183bf02735f83b7e3ab523 Mon Sep 17 00:00:00 2001 From: lededev Date: Thu, 6 May 2021 22:09:28 +0800 Subject: [PATCH 2/3] fix empty number cause prog stop, failed symlink not create on windows --- AV_Data_Capture.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/AV_Data_Capture.py b/AV_Data_Capture.py index 2d2367c..eb8a7b5 100755 --- a/AV_Data_Capture.py +++ b/AV_Data_Capture.py @@ -80,17 +80,24 @@ def rm_empty_folder(path): def create_data_and_move(file_path: str, c: config.Config, debug): # Normalized number, eg: 111xxx-222.mp4 -> xxx-222.mp4 - n_number = get_number(debug, os.path.basename(file_path)) + file_name = os.path.basename(file_path) + n_number = get_number(debug, file_name) file_path = os.path.abspath(file_path) if debug == True: print("[!]Making Data for [{}], the number is [{}]".format(file_path, n_number)) - core_main(file_path, n_number, c) + if n_number: + core_main(file_path, n_number, c) + else: + print("[-] number empty ERROR") print("[*]======================================================") else: try: print("[!]Making Data for [{}], the number is [{}]".format(file_path, n_number)) - core_main(file_path, n_number, c) + if n_number: + core_main(file_path, n_number, c) + else: + raise ValueError("number empty") print("[*]======================================================") except Exception as err: print("[-] [{}] ERROR:".format(file_path)) @@ -100,11 +107,11 @@ def create_data_and_move(file_path: str, c: config.Config, debug): if c.failed_move() == False: if c.soft_link(): print("[-]Link {} to failed folder".format(file_path)) - os.symlink(file_path, conf.failed_folder() + "/") + os.symlink(file_path, conf.failed_folder() + "/" + file_name) elif c.failed_move() == True: if c.soft_link(): print("[-]Link {} to failed folder".format(file_path)) - os.symlink(file_path, conf.failed_folder() + "/") + os.symlink(file_path, conf.failed_folder() + "/" + file_name) else: try: print("[-]Move [{}] to failed folder".format(file_path)) From b8607882815a624c475d837b2c0d3a33535ee6c7 Mon Sep 17 00:00:00 2001 From: lededev Date: Thu, 6 May 2021 22:22:02 +0800 Subject: [PATCH 3/3] commit only single file --- number_parser.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/number_parser.py b/number_parser.py index 7175d3d..5414890 100644 --- a/number_parser.py +++ b/number_parser.py @@ -46,8 +46,6 @@ def get_number(debug,filepath: str) -> str: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('_', '-') elif "1pon" in lower_check: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('-', '_') - elif "10mu" in lower_check: - file_number = str(re.search(r'\d{6}(-|_)\d{2}', lower_check, re.A).group()).replace('-', '_') return file_number else: # 提取不含减号-的番号，FANZA CID # 欧美番号匹配规则 @@ -80,8 +78,6 @@ def get_number(debug,filepath: str) -> str: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('_', '-') elif "1pon" in lower_check: file_number = str(re.search(r'\d{6}(-|_)\d{3}', lower_check, re.A).group()).replace('-', '_') - elif "10mu" in lower_check: - file_number = str(re.search(r'\d{6}(-|_)\d{2}', lower_check, re.A).group()).replace('-', '_') return file_number else: # 提取不含减号-的番号，FANZA CID # 欧美番号匹配规则