Update Beta 11.8

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

ADC_function.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import requests
 from configparser import ConfigParser
 import os
@@ -16,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)
@@ -34,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

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
 import glob
 import os
 import time
@@ -7,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')
@@ -27,27 +36,15 @@ 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")
+    a2 = glob.glob(r"./" + directory + "/*.mp4")
-        b2 = glob.glob(r".\\" + directory + "\*.avi")
+    b2 = glob.glob(r"./" + directory + "/*.avi")
-        c2 = glob.glob(r".\\" + directory + "\*.rmvb")
+    c2 = glob.glob(r"./" + directory + "/*.rmvb")
-        d2 = glob.glob(r".\\" + directory + "\*.wmv")
+    d2 = glob.glob(r"./" + directory + "/*.wmv")
-        e2 = glob.glob(r".\\" + directory + "\*.mov")
+    e2 = glob.glob(r"./" + directory + "/*.mov")
-        f2 = glob.glob(r".\\" + directory + "\*.mkv")
+    f2 = glob.glob(r"./" + directory + "/*.mkv")
-        g2 = glob.glob(r".\\" + directory + "\*.flv")
+    g2 = glob.glob(r"./" + directory + "/*.flv")
-        h2 = glob.glob(r".\\" + directory + "\*.ts")
+    h2 = glob.glob(r"./" + directory + "/*.ts")
     total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2
     return total
 def CreatFailedFolder():
@@ -76,8 +73,6 @@ 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')
@@ -103,27 +98,23 @@ def getNumber(filepath):
             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/')
 
 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===========')
@@ -135,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+'] -')
+        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!!!")

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下载
@@ -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>
+>input_directory=<br>
->directory=<br>
 >
 >#everyone switch:1=on, 0=off<br>
 
@@ -129,6 +127,7 @@ config.ini
 >[update]<br>
 >update_check=1<br>
 0为关闭，1为开启，不建议关闭
+PLEX请安装插件：```XBMCnfoMoviesImporter```
 
 ##### 媒体库选择 
 >[media]<br>
@@ -137,11 +136,15 @@ config.ini
 >#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>
->directory=<br>
+如果input_directory后面为空，则抓取和程序同一目录下的影片
-switch为1时，directory才会被触发，抓取程序目录下的directory目录下的电影；如果为0则不触发，抓取和程序同一目录下的影片，directory不生效
 
 ### (可选)设置自定义目录和影片重命名规则
 **已有默认配置**<br>
@@ -158,8 +161,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,14 @@ naming_rule=number+'-'+title
 
 [update]
 update_check=1
-#on=1,off=0
+
+[media]
+media_warehouse=emby
+#emby or plex
+#plex only test!
+
+[directory_capture]
+switch=0
+directory=
+
+#everyone switch:1=on, 0=off

core.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import re
 import os
 import os.path
@@ -13,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=''
@@ -35,19 +44,14 @@ json_data={}
 actor_photo={}
 naming_rule  =''#eval(config['Name_Rule']['naming_rule'])
 location_rule=''#eval(config['Name_Rule']['location_rule'])
-
+program_mode = Config['common']['main_mode']
-Config = ConfigParser()
+failed_folder= Config['common']['failed_output_folder']
-Config.read(config_file, encoding='UTF-8')
+success_folder=Config['common']['success_output_folder']
-try:
-    option = ReadMediaWarehouse()
-except:
-    print('[-]Config media_warehouse read failed!')
-
 #=====================本地文件处理===========================
 def moveFailedFolder():
     global filepath
-    print('[-]Move to "failed"')
+    print('[-]Move to Failed output folder')
-    shutil.move(filepath, str(os.getcwd()) + '/' + 'failed/')
+    shutil.move(filepath, str(os.getcwd()) + '/' + failed_folder + '/')
     os._exit(0)
 def argparse_get_file():
     parser = argparse.ArgumentParser()
@@ -56,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
@@ -94,11 +98,11 @@ def getDataFromJSON(file_number): #从JSON返回元数据
     except:  # 添加 无需 正则表达式的规则
         # ====================fc2fans_club.py====================
         if 'fc2' in file_number:
-            json_data = json.loads(fc2fans_club.main(
+            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-')))
-                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(
+            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-')))
-                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))
@@ -128,10 +132,10 @@ def getDataFromJSON(file_number): #从JSON返回元数据
     # ====================处理异常字符====================== #\/:*?"<>|
     if '\\' in title:
         title=title.replace('\\', ' ')
-    elif '/' in title:
+    elif r'/' in title:
-        title=title.replace('/', '')
+        title=title.replace(r'/', '')
     elif ':' in title:
-        title=title.replace('/', '')
+        title=title.replace(':', '')
     elif '*' in title:
         title=title.replace('*', '')
     elif '?' in title:
@@ -152,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)
 #=====================资源下载部分===========================
@@ -372,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.')
@@ -387,6 +395,8 @@ def renameJpgToBackdrop_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] #影片的路径
@@ -406,8 +416,11 @@ if __name__ == '__main__':
     CreatFailedFolder()
     getDataFromJSON(number)  # 定义番号
     creatFolder()  # 创建文件夹
+    if program_mode == '1':
         imageDownload(filepath)  # creatFoder会返回番号路径
         PrintFiles(filepath)  # 打印文件
         cutImage()  # 裁剪图
         pasteFileToFolder(filepath, path)  # 移动文件
         renameJpgToBackdrop_copy()
+    elif program_mode == '2':
+        pasteFileToFolder_mode2(filepath, path)  # 移动文件

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"
 }