From bc20b09f60aa86f0cc1ed049baa7918111a5da14 Mon Sep 17 00:00:00 2001 From: Yoshiko <42309414+yoshiko2@users.noreply.github.com> Date: Sat, 10 Aug 2019 21:45:36 +0800 Subject: [PATCH] Update Beta 11.8 --- ADC_function.py | 8 ++- AV_Data_Capture.py | 142 ++++++++++++++++++++++----------------------- core.py | 69 ++++++++++++---------- 3 files changed, 113 insertions(+), 106 deletions(-) diff --git a/ADC_function.py b/ADC_function.py index 476560e..c287654 100755 --- a/ADC_function.py +++ b/ADC_function.py @@ -18,13 +18,17 @@ if os.path.exists(config_file): else: print('[+]config.ini: not found, creating...') with open("config.ini", "wt", encoding='UTF-8') as code: + print("[common]", file=code) + print("failed_output_folder=failed", file=code) + print("success_output_folder=JAV_output", file=code) + print("", file=code) print("[proxy]",file=code) print("proxy=127.0.0.1:1080",file=code) print("timeout=10", file=code) print("retry=3", file=code) print("", file=code) print("[Name_Rule]", file=code) - print("location_rule='JAV_output/'+actor+'/'+number",file=code) + print("location_rule=actor+'/'+number",file=code) print("naming_rule=number+'-'+title",file=code) print("", file=code) print("[update]",file=code) @@ -36,10 +40,8 @@ else: print("#plex only test!", file=code) print("", file=code) print("[directory_capture]", file=code) - print("switch=0", file=code) print("directory=", file=code) print("", file=code) - print("everyone switch:1=on, 0=off", file=code) time.sleep(2) print('[+]config.ini: created!') try: diff --git a/AV_Data_Capture.py b/AV_Data_Capture.py index 7d4da3c..4eefec9 100755 --- a/AV_Data_Capture.py +++ b/AV_Data_Capture.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import glob @@ -9,13 +10,19 @@ from ADC_function import * import json import shutil from configparser import ConfigParser - -version='0.11.6' os.chdir(os.getcwd()) +# ============global var=========== + +version='0.11.8' + config = ConfigParser() config.read(config_file, encoding='UTF-8') +Platform = sys.platform + +# ==========global var end========= + def UpdateCheck(): if UpdateCheckSwitch() == '1': html2 = get_html('https://raw.githubusercontent.com/wenead99/AV_Data_Capture/master/update_check.json') @@ -29,29 +36,17 @@ def UpdateCheck(): else: print('[+]Update Check disabled!') def movie_lists(): - if config['directory_capture']['switch'] == '0' or config['directory_capture']['switch'] == '': - a2 = glob.glob(r".\*.mp4") - b2 = glob.glob(r".\*.avi") - c2 = glob.glob(r".\*.rmvb") - d2 = glob.glob(r".\*.wmv") - e2 = glob.glob(r".\*.mov") - f2 = glob.glob(r".\*.mkv") - g2 = glob.glob(r".\*.flv") - h2 = glob.glob(r".\*.ts") - total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2 - return total - elif config['directory_capture']['switch'] == '1': - directory = config['directory_capture']['directory'] - a2 = glob.glob(r".\\" + directory + "\*.mp4") - b2 = glob.glob(r".\\" + directory + "\*.avi") - c2 = glob.glob(r".\\" + directory + "\*.rmvb") - d2 = glob.glob(r".\\" + directory + "\*.wmv") - e2 = glob.glob(r".\\" + directory + "\*.mov") - f2 = glob.glob(r".\\" + directory + "\*.mkv") - g2 = glob.glob(r".\\" + directory + "\*.flv") - h2 = glob.glob(r".\\" + directory + "\*.ts") - total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2 - return total + directory = config['directory_capture']['directory'] + a2 = glob.glob(r"./" + directory + "/*.mp4") + b2 = glob.glob(r"./" + directory + "/*.avi") + c2 = glob.glob(r"./" + directory + "/*.rmvb") + d2 = glob.glob(r"./" + directory + "/*.wmv") + e2 = glob.glob(r"./" + directory + "/*.mov") + f2 = glob.glob(r"./" + directory + "/*.mkv") + g2 = glob.glob(r"./" + directory + "/*.flv") + h2 = glob.glob(r"./" + directory + "/*.ts") + total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2 + return total def CreatFailedFolder(): if not os.path.exists('failed/'): # 新建failed文件夹 try: @@ -78,54 +73,48 @@ def rreplace(self, old, new, *max): count = max[0] return new.join(self.rsplit(old, count)) def getNumber(filepath): - try: # 试图提取番号 - # ====番号获取主程序==== - try: # 普通提取番号 主要处理包含减号-的番号 - filepath1 = filepath.replace("_", "-") - filepath1.strip('22-sht.me').strip('-HD').strip('-hd') - filename = str(re.sub("\[\d{4}-\d{1,2}-\d{1,2}\] - ", "", filepath1)) # 去除文件名中时间 - file_number = re.search('\w+-\d+', filename).group() + try: # 普通提取番号 主要处理包含减号-的番号 + filepath1 = filepath.replace("_", "-") + filepath1.strip('22-sht.me').strip('-HD').strip('-hd') + filename = str(re.sub("\[\d{4}-\d{1,2}-\d{1,2}\] - ", "", filepath1)) # 去除文件名中时间 + file_number = re.search('\w+-\d+', filename).group() + return file_number + except: # 提取不含减号-的番号 + try: # 提取东京热番号格式 n1087 + filename1 = str(re.sub("h26\d", "", filepath)).strip('Tokyo-hot').strip('tokyo-hot') + filename0 = str(re.sub(".*?\.com-\d+", "", filename1)).strip('_') + if '-C.' in filepath or '-c.' in filepath: + cn_sub = '1' + file_number = str(re.search('n\d{4}', filename0).group(0)) return file_number - except: # 提取不含减号-的番号 - try: # 提取东京热番号格式 n1087 - filename1 = str(re.sub("h26\d", "", filepath)).strip('Tokyo-hot').strip('tokyo-hot') - filename0 = str(re.sub(".*?\.com-\d+", "", filename1)).strip('_') - if '-C.' in filepath or '-c.' in filepath: - cn_sub = '1' - file_number = str(re.search('n\d{4}', filename0).group(0)) - return file_number - except: # 提取无减号番号 - filename1 = str(re.sub("h26\d", "", filepath)) # 去除h264/265 - filename0 = str(re.sub(".*?\.com-\d+", "", filename1)) - file_number2 = str(re.match('\w+', filename0).group()) - if '-C.' in filepath or '-c.' in filepath: - cn_sub = '1' - file_number = str(file_number2.replace(re.match("^[A-Za-z]+", file_number2).group(), - re.match("^[A-Za-z]+", file_number2).group() + '-')) - return file_number - # if not re.search('\w-', file_number).group() == 'None': - # file_number = re.search('\w+-\w+', filename).group() - # 上面是插入减号-到番号中 - # ====番号获取主程序=结束=== - except Exception as e: # 番号提取异常 - print('[-]' + str(os.path.basename(filepath)) + ' Cannot catch the number :') - print('[-]' + str(os.path.basename(filepath)) + ' :', e) - print('[-]Move ' + os.path.basename(filepath) + ' to failed folder') - - shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/') - except IOError as e2: - print('[-]' + str(os.path.basename(filepath)) + ' Cannot catch the number :') - print('[-]' + str(os.path.basename(filepath)) + ' :', e2) - print('[-]Move ' + os.path.basename(filepath) + ' to failed folder') - shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/') + except: # 提取无减号番号 + filename1 = str(re.sub("h26\d", "", filepath)) # 去除h264/265 + filename0 = str(re.sub(".*?\.com-\d+", "", filename1)) + file_number2 = str(re.match('\w+', filename0).group()) + if '-C.' in filepath or '-c.' in filepath: + cn_sub = '1' + file_number = str(file_number2.replace(re.match("^[A-Za-z]+", file_number2).group(), + re.match("^[A-Za-z]+", file_number2).group() + '-')) + return file_number + # if not re.search('\w-', file_number).group() == 'None': + # file_number = re.search('\w+-\w+', filename).group() + # def RunCore(): - if os.path.exists('core.py'): - os.system('python core.py' + ' "' + i + '" --number "'+getNumber(i)+'"') #从py文件启动（用于源码py） - elif os.path.exists('core.exe'): - os.system('core.exe' + ' "' + i + '" --number "'+getNumber(i)+'"') #从exe启动（用于EXE版程序） - elif os.path.exists('core.py') and os.path.exists('core.exe'): - os.system('python core.py' + ' "' + i + '" --number "' + getNumber(i) + '"') #从py文件启动（用于源码py） + if Platform == 'win32': + if os.path.exists('core.py'): + os.system('python core.py' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从py文件启动（用于源码py） + elif os.path.exists('core.exe'): + os.system('core.exe' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从exe启动（用于EXE版程序） + elif os.path.exists('core.py') and os.path.exists('core.exe'): + os.system('python core.py' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从py文件启动（用于源码py） + else: + if os.path.exists('core.py'): + os.system('python3 core.py' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从py文件启动（用于源码py） + elif os.path.exists('core.exe'): + os.system('core.exe' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从exe启动（用于EXE版程序） + elif os.path.exists('core.py') and os.path.exists('core.exe'): + os.system('python3 core.py' + ' "' + i + '" --number "' + getNumber(i) + '"') # 从py文件启动（用于源码py） if __name__ =='__main__': print('[*]===========AV Data Capture===========') @@ -137,13 +126,20 @@ if __name__ =='__main__': count = 0 count_all = str(len(movie_lists())) + print('[+]Find',str(len(movie_lists())),'movies') for i in movie_lists(): #遍历电影列表 交给core处理 count = count + 1 percentage = str(count/int(count_all)*100)[:4]+'%' print('[!] - '+percentage+' ['+str(count)+'/'+count_all+'] -') - print("[!]Making Data for [" + i + "], the number is [" + getNumber(i) + "]") - RunCore() - print("[*]=====================================") + try: + print("[!]Making Data for [" + i + "], the number is [" + getNumber(i) + "]") + RunCore() + print("[*]=====================================") + except: # 番号提取异常 + print('[-]' + i + ' Cannot catch the number :') + print('[-]Move ' + i + ' to failed folder') + shutil.move(i, str(os.getcwd()) + '/' + 'failed/') + CEF('JAV_output') print("[+]All finished!!!") diff --git a/core.py b/core.py index 0120dda..f22de07 100755 --- a/core.py +++ b/core.py @@ -15,6 +15,13 @@ from configparser import ConfigParser import argparse import javdb +Config = ConfigParser() +Config.read(config_file, encoding='UTF-8') +try: + option = ReadMediaWarehouse() +except: + print('[-]Config media_warehouse read failed!') + #初始化全局变量 title='' studio='' @@ -37,19 +44,14 @@ json_data={} actor_photo={} naming_rule =''#eval(config['Name_Rule']['naming_rule']) location_rule=''#eval(config['Name_Rule']['location_rule']) - -Config = ConfigParser() -Config.read(config_file, encoding='UTF-8') -try: - option = ReadMediaWarehouse() -except: - print('[-]Config media_warehouse read failed!') - +program_mode = Config['common']['main_mode'] +failed_folder= Config['common']['failed_output_folder'] +success_folder=Config['common']['success_output_folder'] #=====================本地文件处理=========================== def moveFailedFolder(): global filepath - print('[-]Move to "failed"') - shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/') + print('[-]Move to Failed output folder') + shutil.move(filepath, str(os.getcwd()) + '/' + failed_folder + '/') os._exit(0) def argparse_get_file(): parser = argparse.ArgumentParser() @@ -58,11 +60,11 @@ def argparse_get_file(): args = parser.parse_args() return (args.file, args.number) def CreatFailedFolder(): - if not os.path.exists('failed/'): # 新建failed文件夹 + if not os.path.exists(failed_folder+'/'): # 新建failed文件夹 try: - os.makedirs('failed/') + os.makedirs(failed_folder+'/') except: - print("[-]failed!can not be make folder 'failed'\n[-](Please run as Administrator)") + print("[-]failed!can not be make Failed output folder\n[-](Please run as Administrator)") os._exit(0) def getDataFromJSON(file_number): #从JSON返回元数据 global title @@ -96,11 +98,11 @@ def getDataFromJSON(file_number): #从JSON返回元数据 except: # 添加 无需 正则表达式的规则 # ====================fc2fans_club.py==================== if 'fc2' in file_number: - json_data = json.loads(fc2fans_club.main( - file_number.strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-').strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-'))) + json_data = json.loads(fc2fans_club.main(file_number.strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-').strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-'))) elif 'FC2' in file_number: - json_data = json.loads(fc2fans_club.main( - file_number.strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-').strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-'))) + json_data = json.loads(fc2fans_club.main(file_number.strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-').strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-'))) + elif 'siro' in number or 'SIRO' in number or 'Siro' in number: + json_data = json_data(siro.main(file_number)) # =======================javbus.py======================= else: json_data = json.loads(javbus.main(file_number)) @@ -130,10 +132,10 @@ def getDataFromJSON(file_number): #从JSON返回元数据 # ====================处理异常字符====================== #\/:*?"<>| if '\\' in title: title=title.replace('\\', ' ') - elif '/' in title: - title=title.replace('/', '') + elif r'/' in title: + title=title.replace(r'/', '') elif ':' in title: - title=title.replace('/', '') + title=title.replace(':', '') elif '*' in title: title=title.replace('*', '') elif '?' in title: @@ -154,16 +156,16 @@ def creatFolder(): #创建文件夹 global actor global path if len(actor) > 240: #新建成功输出文件夹 - path = location_rule.replace("'actor'","'超多人'",3).replace("actor","'超多人'",3) #path为影片+元数据所在目录 + path = success_folder+'/'+location_rule.replace("'actor'","'超多人'",3).replace("actor","'超多人'",3) #path为影片+元数据所在目录 #print(path) else: - path = location_rule + path = success_folder+'/'+location_rule #print(path) if not os.path.exists(path): try: os.makedirs(path) except: - path = location_rule.replace('/['+number+']-'+title,"/number") + path = success_folder+'/'+location_rule.replace('/['+number+']-'+title,"/number") #print(path) os.makedirs(path) #=====================资源下载部分=========================== @@ -374,13 +376,17 @@ def pasteFileToFolder(filepath, path): #文件路径，番号，后缀，要移 global houzhui houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|avi|rmvb|wmv|mov|mp4|mkv|flv|ts)$', filepath).group()) try: - os.rename(filepath, number + houzhui) + os.rename(filepath, path + '/' + number + houzhui) except FileExistsError: print('[-]File Exists! Please check your movie!') print('[-]move to the root folder of the program.') os._exit(0) +def pasteFileToFolder_mode2(filepath, path): #文件路径，番号，后缀，要移动至的位置 + global houzhui + houzhui = str(re.search('[.](AVI|RMVB|WMV|MOV|MP4|MKV|FLV|TS|avi|rmvb|wmv|mov|mp4|mkv|flv|ts)$', filepath).group()) try: - shutil.move(number + houzhui, path) + os.rename(filepath, path + houzhui) + print('[+]Movie ' + number + ' move to target folder Finished!') except: print('[-]File Exists! Please check your movie!') print('[-]move to the root folder of the program.') @@ -410,8 +416,11 @@ if __name__ == '__main__': CreatFailedFolder() getDataFromJSON(number) # 定义番号 creatFolder() # 创建文件夹 - imageDownload(filepath) # creatFoder会返回番号路径 - PrintFiles(filepath) # 打印文件 - cutImage() # 裁剪图 - pasteFileToFolder(filepath, path) # 移动文件 - renameJpgToBackdrop_copy() + if program_mode == '1': + imageDownload(filepath) # creatFoder会返回番号路径 + PrintFiles(filepath) # 打印文件 + cutImage() # 裁剪图 + pasteFileToFolder(filepath, path) # 移动文件 + renameJpgToBackdrop_copy() + elif program_mode == '2': + pasteFileToFolder_mode2(filepath, path) # 移动文件