Update Beta 11.8

ADC_function.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import requests
@@ -19,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)
@@ -37,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:

AV_Data_Capture.py

@@ -8,21 +8,26 @@ import re
 import sys
 from ADC_function import *
 import json
-import subprocess
 import shutil
 from configparser import ConfigParser
-
-version='0.11.7'
 os.chdir(os.getcwd())
 
-input_dir='.' # 电影的读取与输出路径, 默认为当前路径
+# ============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':
-        html = json.loads(get_html('https://raw.githubusercontent.com/wenead99/AV_Data_Capture/master/update_check.json'))
+        html2 = get_html('https://raw.githubusercontent.com/wenead99/AV_Data_Capture/master/update_check.json')
+        html = json.loads(str(html2))
+
         if not version == html['version']:
             print('[*]        * New update ' + html['version'] + ' *')
             print('[*]             * Download *')
@@ -30,44 +35,24 @@ def UpdateCheck():
             print('[*]=====================================')
     else:
         print('[+]Update Check disabled!')
-
-def set_directory(): # 设置读取与存放路径
-    global input_dir
-    # 配置项switch为1且定义了新的路径时, 更改默认存取路径
-    if config['directory_capture']['switch'] == '1': 
-        custom_input = config['directory_capture']['input_directory']
-        if custom_input != '': # 自定义了输入路径
-            input_dir = format_path(custom_input)
-            # 若自定义了输入路径, 输出路径默认在输入路径下
-    CreatFolder(input_dir)
-    #print('[+]Working directory is "' + os.getcwd() + '".')
-    #print('[+]Using "' + input_dir + '" as input directory.')
-
-def format_path(path): # 使路径兼容Linux与MacOS
-    if path.find('\\'): # 是仅兼容Windows的路径格式
-        path_list=path.split('\\')
-        path='/'.join(path_list) # 转换为可移植的路径格式
-    return path
-
-
 def movie_lists():
-    a2 = glob.glob( input_dir + "/*.mp4")
-    b2 = glob.glob( input_dir + "/*.avi")
-    c2 = glob.glob( input_dir + "/*.rmvb")
-    d2 = glob.glob( input_dir + "/*.wmv")
-    e2 = glob.glob( input_dir + "/*.mov")
-    f2 = glob.glob( input_dir + "/*.mkv")
-    g2 = glob.glob( input_dir + "/*.flv")
-    h2 = glob.glob( input_dir + "/*.ts")
+    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 CreatFolder(folder_path):
-    if not os.path.exists(folder_path):  # 新建文件夹
+def CreatFailedFolder():
+    if not os.path.exists('failed/'):  # 新建failed文件夹
         try:
-            print('[+]Creating ' + folder_path)
-            os.makedirs(folder_path)
+            os.makedirs('failed/')
         except:
-            print("[-]failed!can not be make folder '"+folder_path+"'\n[-](Please run as Administrator)")
+            print("[-]failed!can not be make folder 'failed'\n[-](Please run as Administrator)")
             os._exit(0)
 def lists_from_test(custom_nuber): #电影列表
     a=[]
@@ -88,89 +73,74 @@ 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')
-        #print('[-]' + filepath + ' -> ' + output_dir + '/failed/')
-        #shutil.move(filepath, output_dir + '/failed/')
-    except IOError as e2:
-        print('[-]' + str(os.path.basename(filepath)) + ' Cannot catch the number :')
-        print('[-]' + str(os.path.basename(filepath)) + ' :', e2)
-        #print('[-]' + filepath + ' -> ' + output_dir + '/failed/')
-        #shutil.move(filepath, output_dir + '/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(movie):
-    # 异步调用core.py, core.py作为子线程执行, 本程序继续执行.
-    if os.path.exists('core.py'):
-        cmd_arg=[sys.executable,'core.py',movie,'--number',getNumber(movie)] #从py文件启动（用于源码py）
-    elif os.path.exists('core.exe'):
-        cmd_arg=['core.exe',movie,'--number',getNumber(movie)] #从exe启动（用于EXE版程序）
-    elif os.path.exists('core.py') and os.path.exists('core.exe'):
-        cmd_arg=[sys.executable,'core.py',movie,'--number',getNumber(movie)] #从py文件启动（用于源码py）
-    process=subprocess.Popen(cmd_arg)
-    return process
+def RunCore():
+    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===========')
-    print('[*]           Version  '+version)
+    print('[*]           Version '+version)
     print('[*]=====================================')
+    CreatFailedFolder()
     UpdateCheck()
     os.chdir(os.getcwd())
-    set_directory()
-
 
     count = 0
-    movies = movie_lists()
-    count_all = str(len(movies))
-    print('[+]Find ' + str(len(movies)) + ' movies.')
-    process_list=[]
-    for movie in movies: #遍历电影列表 交给core处理
-        num=getNumber(movie) # 获取番号
-        if num is None:
-            movies.remove(movie) # 未获取到番号, 则将影片从列表移除
-            count_all=count_all-1
-            continue
-        print("[!]Making Data for   [" + movie + "], the number is [" + num + "]")
-        process=RunCore(movie)
-        process_list.append(process)
-    print("[*]=====================================")
-    for i in range(len(movies)):
-        process_list[i].communicate()
-        percentage = str((i+1)/int(count_all)*100)[:4]+'%'
+    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("[!]The [" + getNumber(movies[i]) + "] process is done.")
-    print("[*]=====================================")
-        
-    CEF(input_dir)
+        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!!!")
-    input("[+][+]Press enter key exit, you can check the error messge before you exit.\n[+][+]按回车键结束，你可以在结束之前查看和错误信息。")
+    input("[+][+]Press enter key exit, you can check the error messge before you exit.\n[+][+]按回车键结束，你可以在结束之前查看和错误信息。")

README.md

@@ -100,11 +100,9 @@ config.ini
 >[media]<br>
 >media_warehouse=emby<br>
 >#emby or plex<br>
->#plex only test!<br>
 >
 >[directory_capture]<br>
->switch=0<br>
->directory=<br>
+>input_directory=<br>
 >
 >#everyone switch:1=on, 0=off<br>
 
@@ -138,12 +136,15 @@ PLEX请安装插件：```XBMCnfoMoviesImporter```
 >#plex only test!<br>
 建议选择emby, plex不完善
 
+#### 输出目录选择
+>[directory_capture]<br>
+>location_rule='JAV_output/'+actor+'/['+number+']-'+title<br>
+开头的JAV_output即输出目录，自定义过程不要把前后的冒号 '' 去除
+
 #### 抓取目录选择
 >[directory_capture]<br>
->switch=0<br>
 >input_directory=<br>
->output_directory=<br>
-switch为1时，目录自定义才会被触发，此时可以指定抓取任意目录下的影片, 并指定存放的目录；如果为0则不触发，抓取和程序同一目录下的影片，directory不生效. 如果仅指定input_directory, output_directory默认与input_directory相同.
+如果input_directory后面为空，则抓取和程序同一目录下的影片
 
 ### (可选)设置自定义目录和影片重命名规则
 **已有默认配置**<br>

config.ini

@@ -16,6 +16,7 @@ media_warehouse=emby
 #plex only test!
 
 [directory_capture]
-input_directory=
+switch=0
+directory=
 
-#everyone switch:1=on, 0=off
+#everyone switch:1=on, 0=off

core.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import re
@@ -16,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=''
@@ -38,33 +44,27 @@ 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"')
-    #print('[-]' + filepath + ' -> ' + output_dir + '/failed/')
-    #os.rename(filepath, output_dir + '/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()
-    parser.add_argument("file", help="Write the file path on here")
     parser.add_argument("--number", help="Enter Number on here", default='')
+    parser.add_argument("file", help="Write the file path on here")
     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
@@ -98,13 +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.loads(siro.main(file_number))
+            json_data = json_data(siro.main(file_number))
         # =======================javbus.py=======================
         else:
             json_data = json.loads(javbus.main(file_number))
@@ -134,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:
@@ -158,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)
 #=====================资源下载部分===========================
@@ -377,14 +375,23 @@ def cutImage():
 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())
-    os.rename(filepath, number + houzhui)
     try:
-        shutil.move(number + houzhui, path)
+        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:
+        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.')
         os._exit(0)
-def moveJpgToBackdrop_copy():
+def renameJpgToBackdrop_copy():
     if option == 'plex':
         shutil.copy(path + '/fanart.jpg', path + '/Backdrop.jpg')
         shutil.copy(path + '/poster.png', path + '/thumb.png')
@@ -402,15 +409,18 @@ if __name__ == '__main__':
             number = str(re.findall(r'(.+?)\.',str(re.search('([^<>/\\\\|:""\\*\\?]+)\\.\\w+$',filepath).group()))).strip("['']").replace('_','-')
             print("[!]Making Data for   [" + number + "]")
         except:
-            print("[-]failed!Please move the filename again!")
+            print("[-]failed!Please rename the filename again!")
             moveFailedFolder()
     else:
         number = argparse_get_file()[1]
     CreatFailedFolder()
     getDataFromJSON(number)  # 定义番号
     creatFolder()  # 创建文件夹
-    imageDownload(filepath)  # creatFoder会返回番号路径
-    PrintFiles(filepath)  # 打印文件
-    cutImage()  # 裁剪图
-    pasteFileToFolder(filepath, path)  # 移动文件
-    moveJpgToBackdrop_copy()
+    if program_mode == '1':
+        imageDownload(filepath)  # creatFoder会返回番号路径
+        PrintFiles(filepath)  # 打印文件
+        cutImage()  # 裁剪图
+        pasteFileToFolder(filepath, path)  # 移动文件
+        renameJpgToBackdrop_copy()
+    elif program_mode == '2':
+        pasteFileToFolder_mode2(filepath, path)  # 移动文件

fc2fans_club.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import re
 from lxml import etree#need install
 import json
@@ -82,4 +81,4 @@ def main(number2):
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'),)#.encode('UTF-8')
     return js
 
-#print(main('1051725'))
+#print(main('1051725'))

javbus.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import re
 import requests #need install
 from pyquery import PyQuery as pq#need install
@@ -174,4 +173,4 @@ def main_uncensored(number):
         js2 = javdb.main(number)
         return js2
 
-    return js
+    return js

javdb.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import re
 from lxml import etree
 import json
@@ -138,4 +137,4 @@ def main(number):
         js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
         return js
 
-#print(main('061519-861'))
+#print(main('061519-861'))

siro.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import re
 from lxml import etree
 import json
@@ -102,4 +101,4 @@ def main(number2):
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'),)#.encode('UTF-8')
     return js
 
-#print(main('300maan-373'))
+#print(main('300maan-373'))