Update Beta 11.7

Fix the path error under Linux and specify Python3 as the runtime.

ADC_function.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
 import requests
 from configparser import ConfigParser
 import os

AV_Data_Capture.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
 import glob
 import os
 import time
@@ -5,20 +8,21 @@ import re
 import sys
 from ADC_function import *
 import json
+import subprocess
 import shutil
 from configparser import ConfigParser
 
-version='0.11.6'
+version='0.11.7'
 os.chdir(os.getcwd())
 
+input_dir='.' # 电影的读取与输出路径, 默认为当前路径
+
 config = ConfigParser()
 config.read(config_file, encoding='UTF-8')
 
 def UpdateCheck():
     if UpdateCheckSwitch() == '1':
-        html2 = get_html('https://raw.githubusercontent.com/wenead99/AV_Data_Capture/master/update_check.json')
+        html = json.loads(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 *')
@@ -26,36 +30,44 @@ 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():
-    if config['directory_capture']['switch'] == '0' or config['directory_capture']['switch'] == '':
+    a2 = glob.glob( input_dir + "/*.mp4")
-        a2 = glob.glob(r".\*.mp4")
+    b2 = glob.glob( input_dir + "/*.avi")
-        b2 = glob.glob(r".\*.avi")
+    c2 = glob.glob( input_dir + "/*.rmvb")
-        c2 = glob.glob(r".\*.rmvb")
+    d2 = glob.glob( input_dir + "/*.wmv")
-        d2 = glob.glob(r".\*.wmv")
+    e2 = glob.glob( input_dir + "/*.mov")
-        e2 = glob.glob(r".\*.mov")
+    f2 = glob.glob( input_dir + "/*.mkv")
-        f2 = glob.glob(r".\*.mkv")
+    g2 = glob.glob( input_dir + "/*.flv")
-        g2 = glob.glob(r".\*.flv")
+    h2 = glob.glob( input_dir + "/*.ts")
-        h2 = glob.glob(r".\*.ts")
+    total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2
-        total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2
+    return total
-        return total
+def CreatFolder(folder_path):
-    elif config['directory_capture']['switch'] == '1':
+    if not os.path.exists(folder_path):  # 新建文件夹
-        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:
-            os.makedirs('failed/')
+            print('[+]Creating ' + folder_path)
+            os.makedirs(folder_path)
         except:
-            print("[-]failed!can not be make folder 'failed'\n[-](Please run as Administrator)")
+            print("[-]failed!can not be make folder '"+folder_path+"'\n[-](Please run as Administrator)")
             os._exit(0)
 def lists_from_test(custom_nuber): #电影列表
     a=[]
@@ -109,40 +121,56 @@ def getNumber(filepath):
         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, str(os.getcwd()) + '/' + '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('[-]Move ' + os.path.basename(filepath) + ' to failed folder')
+        #print('[-]' + filepath + ' -> ' + output_dir + '/failed/')
-        shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/')
+        #shutil.move(filepath, output_dir + '/failed/')
 
-def RunCore():
+def RunCore(movie):
+    # 异步调用core.py, core.py作为子线程执行, 本程序继续执行.
     if os.path.exists('core.py'):
-        os.system('python core.py' + '   "' + i + '" --number "'+getNumber(i)+'"')     #从py文件启动（用于源码py）
+        cmd_arg=[sys.executable,'core.py',movie,'--number',getNumber(movie)] #从py文件启动（用于源码py）
     elif os.path.exists('core.exe'):
-        os.system('core.exe' + '   "' + i + '" --number "'+getNumber(i)+'"')           #从exe启动（用于EXE版程序）
+        cmd_arg=['core.exe',movie,'--number',getNumber(movie)] #从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）
+        cmd_arg=[sys.executable,'core.py',movie,'--number',getNumber(movie)] #从py文件启动（用于源码py）
+    process=subprocess.Popen(cmd_arg)
+    return process
 
 if __name__ =='__main__':
     print('[*]===========AV Data Capture===========')
-    print('[*]           Version '+version)
+    print('[*]           Version  '+version)
     print('[*]=====================================')
-    CreatFailedFolder()
     UpdateCheck()
     os.chdir(os.getcwd())
+    set_directory()
+
 
     count = 0
-    count_all = str(len(movie_lists()))
+    movies = movie_lists()
-    for i in movie_lists(): #遍历电影列表 交给core处理
+    count_all = str(len(movies))
-        count = count + 1
+    print('[+]Find ' + str(len(movies)) + ' movies.')
-        percentage = str(count/int(count_all)*100)[:4]+'%'
+    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]+'%'
         print('[!] - '+percentage+' ['+str(count)+'/'+count_all+'] -')
-        print("[!]Making Data for   [" + i + "], the number is [" + getNumber(i) + "]")
+        print("[!]The [" + getNumber(movies[i]) + "] process is done.")
-        RunCore()
+    print("[*]=====================================")
-        print("[*]=====================================")
         
-    CEF('JAV_output')
+    CEF(input_dir)
     print("[+]All finished!!!")
     input("[+][+]Press enter key exit, you can check the error messge before you exit.\n[+][+]按回车键结束，你可以在结束之前查看和错误信息。")

README.md

@@ -52,7 +52,7 @@
 
 # 如何使用
 ### 下载
-* release的程序可脱离**python环境**运行，可跳过 [模块安装](#1请安装模块在cmd终端逐条输入以下命令安装)<br>Release 下载地址(**仅限Windows**):<br>[![](https://img.shields.io/badge/%E4%B8%8B%E8%BD%BD-windows-blue.svg?style=for-the-badge&logo=windows)](https://github.com/yoshiko2/AV_Data_Capture/releases/download/0.11.5/Beta11.5.zip)<br>
+* release的程序可脱离**python环境**运行，可跳过 [模块安装](#1请安装模块在cmd终端逐条输入以下命令安装)<br>Release 下载地址(**仅限Windows**):<br>[![](https://img.shields.io/badge/%E4%B8%8B%E8%BD%BD-windows-blue.svg?style=for-the-badge&logo=windows)](https://github.com/yoshiko2/AV_Data_Capture/releases/download/0.11.6/Beta11.6.zip)<br>
 * Linux,MacOS请下载源码包运行
 
 * Windows Python环境:[点击前往](https://www.python.org/downloads/windows/) 选中executable installer下载
@@ -129,6 +129,7 @@ config.ini
 >[update]<br>
 >update_check=1<br>
 0为关闭，1为开启，不建议关闭
+PLEX请安装插件：```XBMCnfoMoviesImporter```
 
 ##### 媒体库选择 
 >[media]<br>
@@ -140,8 +141,9 @@ config.ini
 #### 抓取目录选择
 >[directory_capture]<br>
 >switch=0<br>
->directory=<br>
+>input_directory=<br>
-switch为1时，directory才会被触发，抓取程序目录下的directory目录下的电影；如果为0则不触发，抓取和程序同一目录下的影片，directory不生效
+>output_directory=<br>
+switch为1时，目录自定义才会被触发，此时可以指定抓取任意目录下的影片, 并指定存放的目录；如果为0则不触发，抓取和程序同一目录下的影片，directory不生效. 如果仅指定input_directory, output_directory默认与input_directory相同.
 
 ### (可选)设置自定义目录和影片重命名规则
 **已有默认配置**<br>
@@ -158,8 +160,8 @@ switch为1时，directory才会被触发，抓取程序目录下的directory目
 >outline = 简介<br>
 >runtime = 时长<br>
 ##### **例子**:<br>
->目录结构规则:location_rule='JAV_output/'+actor+'/'+number **不推荐修改目录结构规则，抓取数据时新建文件夹容易出错**<br>
+目录结构规则:```location_rule='JAV_output/'+actor+'/'+number```<br> **不推荐修改时在这里添加title**，有时title过长，因为Windows API问题，抓取数据时新建文件夹容易出错。<br>
->影片命名规则:naming_rule='['+number+']-'+title<br> **在EMBY,KODI等本地媒体库显示的标题**
+影片命名规则:```naming_rule='['+number+']-'+title```<br> **在EMBY,KODI等本地媒体库显示的标题，不影响目录结构下影片文件的命名**，依旧是 番号+后缀。
 ### 3.更新开关
 >[update]<br>update_check=1<br>
 1为开，0为关

config.ini

@@ -9,4 +9,13 @@ naming_rule=number+'-'+title
 
 [update]
 update_check=1
-#on=1,off=0
+
+[media]
+media_warehouse=emby
+#emby or plex
+#plex only test!
+
+[directory_capture]
+input_directory=
+
+#everyone switch:1=on, 0=off

core.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
 import re
 import os
 import os.path
@@ -47,18 +50,19 @@ except:
 def moveFailedFolder():
     global filepath
     print('[-]Move to "failed"')
-    shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/')
+    #print('[-]' + filepath + ' -> ' + output_dir + '/failed/')
+    #os.rename(filepath, output_dir + '/failed/')
     os._exit(0)
 def argparse_get_file():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--number", help="Enter Number on here", default='')
     parser.add_argument("file", help="Write the file path on here")
+    parser.add_argument("--number", help="Enter Number on here", default='')
     args = parser.parse_args()
     return (args.file, args.number)
 def CreatFailedFolder():
-    if not os.path.exists('failed/'):  # 新建failed文件夹
+    if not os.path.exists('/failed/'):  # 新建failed文件夹
         try:
-            os.makedirs('failed/')
+            os.makedirs('/failed/')
         except:
             print("[-]failed!can not be make folder 'failed'\n[-](Please run as Administrator)")
             os._exit(0)
@@ -99,6 +103,8 @@ def getDataFromJSON(file_number): #从JSON返回元数据
         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-')))
+        elif 'siro' in number or 'SIRO' in number or 'Siro' in number:
+            json_data = json.loads(siro.main(file_number))
         # =======================javbus.py=======================
         else:
             json_data = json.loads(javbus.main(file_number))
@@ -371,22 +377,19 @@ 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())
-    try:
+    os.rename(filepath, number + houzhui)
-        os.rename(filepath, number + houzhui)
-    except FileExistsError:
-        print('[-]File Exists! Please check your movie!')
-        print('[-]move to the root folder of the program.')
-        os._exit(0)
     try:
         shutil.move(number + houzhui, path)
     except:
         print('[-]File Exists! Please check your movie!')
         print('[-]move to the root folder of the program.')
         os._exit(0)
-def renameJpgToBackdrop_copy():
+def moveJpgToBackdrop_copy():
     if option == 'plex':
         shutil.copy(path + '/fanart.jpg', path + '/Backdrop.jpg')
         shutil.copy(path + '/poster.png', path + '/thumb.png')
+    if option == 'emby':
+        shutil.copy(path + '/' + number + '.jpg', path + '/Backdrop.jpg')
 
 if __name__ == '__main__':
     filepath=argparse_get_file()[0] #影片的路径
@@ -399,7 +402,7 @@ 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 rename the filename again!")
+            print("[-]failed!Please move the filename again!")
             moveFailedFolder()
     else:
         number = argparse_get_file()[1]
@@ -410,4 +413,4 @@ if __name__ == '__main__':
     PrintFiles(filepath)  # 打印文件
     cutImage()  # 裁剪图
     pasteFileToFolder(filepath, path)  # 移动文件
-    renameJpgToBackdrop_copy()
+    moveJpgToBackdrop_copy()

fc2fans_club.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import re
 from lxml import etree#need install
 import json

javbus.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import re
 import requests #need install
 from pyquery import PyQuery as pq#need install

javdb.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import re
 from lxml import etree
 import json

siro.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import re
 from lxml import etree
 import json

update_check.json

@@ -1,5 +1,5 @@
 {
-	"version": "0.11.6",
+	"version": "0.11.7",
-	"version_show":"Beta 11.6",
+	"version_show":"Beta 11.7",
 	"download": "https://github.com/wenead99/AV_Data_Capture/releases"
 }