Update README.md

AV_Data_Capture-1.1（支持分集）

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
@@ -7,16 +10,22 @@ from ADC_function import *
 import json
 import shutil
 from configparser import ConfigParser
-
-version='0.11.6'
 os.chdir(os.getcwd())
 
+# ============global var===========
+
+version='1.3'
+
 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')
+        html2 = get_html('https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/update_check.json')
         html = json.loads(str(html2))
 
         if not version == html['version']:
@@ -27,28 +36,26 @@ def UpdateCheck():
     else:
         print('[+]Update Check disabled!')
 def movie_lists():
-    if config['directory_capture']['switch'] == '0' or config['directory_capture']['switch'] == '':
+    global exclude_directory_1
-        a2 = glob.glob(r".\*.mp4")
+    global exclude_directory_2
-        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")
+    total=[]
-        b2 = glob.glob(r".\\" + directory + "\*.avi")
+    file_type = ['mp4','avi','rmvb','wmv','mov','mkv','flv','ts']
-        c2 = glob.glob(r".\\" + directory + "\*.rmvb")
+    exclude_directory_1 = config['common']['failed_output_folder']
-        d2 = glob.glob(r".\\" + directory + "\*.wmv")
+    exclude_directory_2 = config['common']['success_output_folder']
-        e2 = glob.glob(r".\\" + directory + "\*.mov")
+    if directory=='*':
-        f2 = glob.glob(r".\\" + directory + "\*.mkv")
+        remove_total = []
-        g2 = glob.glob(r".\\" + directory + "\*.flv")
+        for o in file_type:
-        h2 = glob.glob(r".\\" + directory + "\*.ts")
+            remove_total += glob.glob(r"./" + exclude_directory_1 + "/*." + o)
-        total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2
+            remove_total += glob.glob(r"./" + exclude_directory_2 + "/*." + o)
+        for i in os.listdir(os.getcwd()):
+            for a in file_type:
+                total += glob.glob(r"./" + i + "/*." + a)
+        for b in remove_total:
+            total.remove(b)
+        return total
+    for a in file_type:
+        total += glob.glob(r"./" + directory + "/*." + a)
     return total
 def CreatFailedFolder():
     if not os.path.exists('failed/'):  # 新建failed文件夹
@@ -62,9 +69,9 @@ def lists_from_test(custom_nuber): #电影列表
     a.append(custom_nuber)
     return a
 def CEF(path):
+    try:
         files = os.listdir(path)  # 获取路径下的子文件(夹)列表
         for file in files:
-        try: #试图删除空目录,非空目录删除会报错
             os.removedirs(path + '/' + file)  # 删除这个空文件夹
             print('[+]Deleting empty folder', path + '/' + file)
     except:
@@ -76,54 +83,44 @@ def rreplace(self, old, new, *max):
         count = max[0]
     return new.join(self.rsplit(old, count))
 def getNumber(filepath):
-    try:  # 试图提取番号
+    filepath = filepath.replace('.\\','')
-        # ====番号获取主程序====
     try:  # 普通提取番号 主要处理包含减号-的番号
-            filepath1 = filepath.replace("_", "-")
+        filepath = filepath.replace("_", "-")
-            filepath1.strip('22-sht.me').strip('-HD').strip('-hd')
+        filepath.strip('22-sht.me').strip('-HD').strip('-hd')
-            filename = str(re.sub("\[\d{4}-\d{1,2}-\d{1,2}\] - ", "", filepath1))  # 去除文件名中时间
+        filename = str(re.sub("\[\d{4}-\d{1,2}-\d{1,2}\] - ", "", filepath))  # 去除文件名中时间
+        try:
             file_number = re.search('\w+-\d+', filename).group()
+        except:  # 提取类似mkbd-s120番号
+            file_number = re.search('\w+-\w+\d+', filename).group()
         return file_number
     except:  # 提取不含减号-的番号
-            try:  # 提取东京热番号格式 n1087
+        try:
-                filename1 = str(re.sub("h26\d", "", filepath)).strip('Tokyo-hot').strip('tokyo-hot')
+            filename = str(re.sub("ts6\d", "", filepath)).strip('Tokyo-hot').strip('tokyo-hot')
-                filename0 = str(re.sub(".*?\.com-\d+", "", filename1)).strip('_')
+            filename = str(re.sub(".*?\.com-\d+", "", filename)).replace('_', '')
-                if '-C.' in filepath or '-c.' in filepath:
+            file_number = str(re.search('\w+\d{4}', filename).group(0))
-                    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
+            filename = str(re.sub("ts6\d", "", filepath))  # 去除ts64/265
-                filename0 = str(re.sub(".*?\.com-\d+", "", filename1))
+            filename = str(re.sub(".*?\.com-\d+", "", filename))
-                file_number2 = str(re.match('\w+', filename0).group())
+            file_number = str(re.match('\w+', filename).group())
-                if '-C.' in filepath or '-c.' in filepath:
+            file_number = str(file_number.replace(re.match("^[A-Za-z]+", file_number).group(),re.match("^[A-Za-z]+", file_number).group() + '-'))
-                    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/')
 
 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,14 +132,22 @@ 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/')
+            continue
 
-    CEF('JAV_output')
+    CEF(exclude_directory_1)
+    CEF(exclude_directory_2)
     print("[+]All finished!!!")
     input("[+][+]Press enter key exit, you can check the error messge before you exit.\n[+][+]按回车键结束，你可以在结束之前查看和错误信息。")

README.md

@@ -5,7 +5,8 @@
 ![](https://img.shields.io/badge/build-passing-brightgreen.svg?style=flat-square)
 ![](https://img.shields.io/github/downloads/yoshiko2/av_data_capture/total.svg?style=flat-square)<br>
 ![](https://img.shields.io/github/license/yoshiko2/av_data_capture.svg?style=flat-square)
-![](https://img.shields.io/github/release/yoshiko2/av_data_capture.svg?style=flat-square)<br>
+![](https://img.shields.io/github/release/yoshiko2/av_data_capture.svg?style=flat-square)
+![](https://img.shields.io/badge/Python-3.7-yellow.svg?style=flat-square&logo=python)<br>
 
 
 **日本电影元数据 抓取工具 | 刮削器**，配合本地影片管理软件EMBY,KODI管理本地影片，该软件起到分类与元数据抓取作用，利用元数据信息来分类，供本地影片分类整理使用。
@@ -20,16 +21,20 @@
 * [简明教程](#简要教程)
 * [模块安装](#1请安装模块在cmd终端逐条输入以下命令安装)
 * [配置](#2配置configini)
-* [运行软件](#4运行-av_data_capturepyexe)
+* [(可选)设置自定义目录和影片重命名规则](#3可选设置自定义目录和影片重命名规则)
-* [异常处理（重要）](#5异常处理重要)
+* [运行软件](#5运行-av_data_capturepyexe)
-* [导入至媒体库](#7把jav_output文件夹导入到embykodi中根据封面选片子享受手冲乐趣)
+* [影片原路径处理](#4建议把软件拷贝和电影的统一目录下)
-* [写在后面](#8写在后面)
+* [异常处理（重要）](#51异常处理重要)
+* [导入至媒体库](#7把jav_output文件夹导入到embykodi中等待元数据刷新完成)
+* [关于群晖NAS](#8关于群晖NAS)
+* [写在后面](#9写在后面)
 
 # 免责声明
-1.本软件仅供**技术交流，学术交流**使用，本项目旨在学习 Python3<br>
+* 本软件仅供**技术交流，学术交流**使用，本项目旨在学习 Python3<br>
-2.本软件禁止用于任何非法用途<br>
+* 本软件禁止用于任何非法用途<br>
-3.使用者使用该软件产生的一切法律后果由使用者承担<br>
+* 使用者使用该软件产生的一切法律后果由使用者承担<br>
-4.不可使用于商业和个人其他意图<br>
+* 不可使用于商业和个人其他意图<br>
+* 使用该软件前，请自觉遵守当地法律法规
 
 # 注意
 **推荐用法: 使用该软件后，对于不能正常获取元数据的电影可以用 Everaver 来补救**<br>
@@ -52,7 +57,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)<br>
 * Linux,MacOS请下载源码包运行
 
 * Windows Python环境:[点击前往](https://www.python.org/downloads/windows/) 选中executable installer下载
@@ -85,13 +90,18 @@ pip install pillow
 
 ## 2.配置config.ini
 config.ini
+>[common]<br>
+>main_mode=1<br>
+>failed_output_folder=failed<br>
+>success_output_folder=JAV_output<br>
+>
 >[proxy]<br>
 >proxy=127.0.0.1:1080<br>
 >timeout=10<br>
 >retry=3<br>
 >
 >[Name_Rule]<br>
->location_rule='JAV_output/'+actor+'/['+number+']-'+title<br>
+>location_rule=actor+'/'+number<br>
 >naming_rule=number+'-'+title<br>
 >
 >[update]<br>
@@ -100,15 +110,25 @@ config.ini
 >[media]<br>
 >media_warehouse=emby<br>
 >#emby or plex<br>
->#plex only test!<br>
 >
 >[directory_capture]<br>
->switch=0<br>
 >directory=<br>
->
->#everyone switch:1=on, 0=off<br>
 
-### 1.网络设置
+### 全局设置
+---
+#### 软件模式
+>[common]<br>
+>main_mode=1<br>
+
+1为普通模式，2为整理模式：仅根据女优把电影命名为番号并分类到女优名称的文件夹下
+
+>failed_output_folder=failed<br>
+>success_output_folder=JAV_outputd<br>
+
+设置成功输出目录和失败输出目录
+
+---
+### 网络设置
 #### * 针对“某些地区”的代理设置
 打开```config.ini```,在```[proxy]```下的```proxy```行设置本地代理地址和端口，支持Shadowxxxx/X,V2XXX本地代理端口:<br>
 例子:```proxy=127.0.0.1:1080```<br>素人系列抓取建议使用日本代理<br>
@@ -120,32 +140,50 @@ config.ini
 >timeout=10<br>
 
 10为超时重试时间 单位：秒
+
+---
 #### 连接重试次数设置
 >[proxy]<br>
 >retry=3<br>
+
 3即为重试次数
 
+---
 #### 检查更新开关
 >[update]<br>
 >update_check=1<br>
+
 0为关闭，1为开启，不建议关闭
 
+---
 ##### 媒体库选择 
 >[media]<br>
 >media_warehouse=emby<br>
 >#emby or plex<br>
->#plex only test!<br>
-建议选择emby, plex不完善
 
+可选择emby, plex<br>
+如果是PLEX，请安装插件：```XBMCnfoMoviesImporter```
+
+---
+#### 调试模式
+>[debug_mode]<br>switch=1<br>
+
+如要开启调试模式，请手动输入以上代码到```config.ini```中，开启后可在抓取中显示影片元数据
+
+---
 #### 抓取目录选择
 >[directory_capture]<br>
->switch=0<br>
 >directory=<br>
-switch为1时，directory才会被触发，抓取程序目录下的directory目录下的电影；如果为0则不触发，抓取和程序同一目录下的影片，directory不生效
+如果directory后面为空，则抓取和程序同一目录下的影片，设置为``` * ```可抓取软件所在目录下的所有子目录中的影片
+### 3.(可选)设置自定义目录和影片重命名规则
+>[Name_Rule]<br>
+>location_rule=actor+'/'+number<br>
+>naming_rule=number+'-'+title<br>
 
-### (可选)设置自定义目录和影片重命名规则
+已有默认配置
-**已有默认配置**<br>
+
-##### 命名参数<br>
+---
+#### 命名参数
 >title = 片名<br>
 >actor = 演员<br>
 >studio = 公司<br>
@@ -157,28 +195,46 @@ switch为1时，directory才会被触发，抓取程序目录下的directory目
 >tag = 类型<br>
 >outline = 简介<br>
 >runtime = 时长<br>
-##### **例子**:<br>
+
->目录结构规则:location_rule='JAV_output/'+actor+'/'+number **不推荐修改目录结构规则，抓取数据时新建文件夹容易出错**<br>
+上面的参数以下都称之为**变量**
->影片命名规则:naming_rule='['+number+']-'+title<br> **在EMBY,KODI等本地媒体库显示的标题**
+
-### 3.更新开关
+#### 例子：
+自定义规则方法：有两种元素，变量和字符，无论是任何一种元素之间连接必须要用加号 **+** ，比如：```'naming_rule=['+number+']-'+title```，其中冒号 ' ' 内的文字是字符，没有冒号包含的文字是变量，元素之间连接必须要用加号 **+** <br>
+目录结构规则：默认 ```location_rule=actor+'/'+number```<br> **不推荐修改时在这里添加title**，有时title过长，因为Windows API问题，抓取数据时新建文件夹容易出错。<br>
+影片命名规则：默认 ```naming_rule=number+'-'+title```<br> **在EMBY,KODI等本地媒体库显示的标题，不影响目录结构下影片文件的命名**，依旧是 番号+后缀。
+
+### 更新开关
 >[update]<br>update_check=1<br>
 1为开，0为关
-## 3.把软件拷贝和电影的统一目录下
+
-## 4.运行 ```AV_Data_capture.py/.exe```
+## 4.建议把软件拷贝和电影的统一目录下
+如果```config.ini```中```directory=```后面为空的情况下
+## 5.运行 ```AV_Data_capture.py/.exe```
 当文件名包含:<br>
 中文，字幕，-c., -C., 处理元数据时会加上**中文字幕**标签
-## 5.异常处理（重要）
+## 5.1 异常处理（重要）
 ### 请确保软件是完整地！确保ini文件内容是和下载提供ini文件内容的一致的！
+---
 ### 关于软件打开就闪退
 可以打开cmd命令提示符，把 ```AV_Data_capture.py/.exe```拖进cmd窗口回车运行，查看错误，出现的错误信息**依据以下条目解决**
+
+---
 ### 关于 ```Updata_check``` 和 ```JSON``` 相关的错误
-跳转 [网络设置](#1网络设置)
+跳转 [网络设置](#网络设置)
+
+---
 ### 关于```FileNotFoundError: [WinError 3] 系统找不到指定的路径。: 'JAV_output''``` 
 在软件所在文件夹下新建 JAV_output 文件夹，可能是你没有把软件拉到和电影的同一目录
+
+---
 ### 关于连接拒绝的错误
-请设置好[代理](#1针对某些地区的代理设置)<br>
+请设置好[代理](#针对某些地区的代理设置)<br>
+
+---
 ### 关于Nonetype,xpath报错
 同上<br>
+
+---
 ### 关于番号提取失败或者异常
 **目前可以提取元素的影片:JAVBUS上有元数据的电影，素人系列:300Maan,259luxu,siro等,FC2系列**<br>
 >下一张图片来自Pockies的blog 原作者已授权<br>
@@ -195,13 +251,17 @@ COSQ-004.mp4
 **野鸡番号**:比如 ```XXX-XXX-1```,  ```1301XX-MINA_YUKA``` 这种**野鸡**番号，在javbus等资料库存在的作品。<br>**重要**：除了 **影片文件名**  ```XXXX-XXX-C```，后面这种-C的是指电影有中文字幕！<br>
 条件：文件名中间要有下划线或者减号"_","-"，没有多余的内容只有番号为最佳，可以让软件更好获取元数据
 对于多影片重命名，可以用[ReNamer](http://www.den4b.com/products/renamer)来批量重命名<br>
+
+---
 ### 关于PIL/image.py
 暂时无解，可能是网络问题或者pillow模块打包问题，你可以用源码运行（要安装好第一步的模块）
 
 
 ## 6.软件会自动把元数据获取成功的电影移动到JAV_output文件夹中，根据演员分类，失败的电影移动到failed文件夹中。
 ## 7.把JAV_output文件夹导入到EMBY,KODI中，等待元数据刷新，完成
-## 8.写在后面
+## 8.关于群晖NAS
+开启SMB在Windows上挂载为网络磁盘即可使用本软件，也适用于其他NAS
+## 9.写在后面
 怎么样，看着自己的日本电影被这样完美地管理，是不是感觉成就感爆棚呢?<br>
 **tg官方电报群:[ 点击进群](https://t.me/AV_Data_Capture_Official)**<br>
 

avsox.py

@@ -0,0 +1,112 @@
+import re
+from lxml import etree
+import json
+from bs4 import BeautifulSoup
+from ADC_function import *
+
+def getActorPhoto(htmlcode): #//*[@id="star_qdt"]/li/a/img
+    soup = BeautifulSoup(htmlcode, 'lxml')
+    a = soup.find_all(attrs={'class': 'avatar-box'})
+    d = {}
+    for i in a:
+        l = i.img['src']
+        t = i.span.get_text()
+        p2 = {t: l}
+        d.update(p2)
+    return d
+def getTitle(a):
+    try:
+        html = etree.fromstring(a, etree.HTMLParser())
+        result = str(html.xpath('/html/body/div[2]/h3/text()')).strip(" ['']") #[0]
+        return result.replace('/', '')
+    except:
+        return ''
+def getActor(a): #//*[@id="center_column"]/div[2]/div[1]/div/table/tbody/tr[1]/td/text()
+    soup = BeautifulSoup(a, 'lxml')
+    a = soup.find_all(attrs={'class': 'avatar-box'})
+    d = []
+    for i in a:
+        d.append(i.span.get_text())
+    return d
+def getStudio(a):
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//p[contains(text(),"制作商: ")]/following-sibling::p[1]/a/text()')).strip(" ['']").replace("', '",' ')
+    return result1
+def getRuntime(a):
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//span[contains(text(),"长度:")]/../text()')).strip(" ['分钟']")
+    return result1
+def getLabel(a):
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//p[contains(text(),"系列:")]/following-sibling::p[1]/a/text()')).strip(" ['']")
+    return result1
+def getNum(a):
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//span[contains(text(),"识别码:")]/../span[2]/text()')).strip(" ['']")
+    return result1
+def getYear(release):
+    try:
+        result = str(re.search('\d{4}',release).group())
+        return result
+    except:
+        return release
+def getRelease(a):
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//span[contains(text(),"发行时间:")]/../text()')).strip(" ['']")
+    return result1
+def getCover(htmlcode):
+    html = etree.fromstring(htmlcode, etree.HTMLParser())
+    result = str(html.xpath('/html/body/div[2]/div[1]/div[1]/a/img/@src')).strip(" ['']")
+    return result
+def getCover_small(htmlcode):
+    html = etree.fromstring(htmlcode, etree.HTMLParser())
+    result = str(html.xpath('//*[@id="waterfall"]/div/a/div[1]/img/@src')).strip(" ['']")
+    return result
+def getTag(a):  # 获取演员
+    soup = BeautifulSoup(a, 'lxml')
+    a = soup.find_all(attrs={'class': 'genre'})
+    d = []
+    for i in a:
+        d.append(i.get_text())
+    return d
+
+def main(number):
+    a = get_html('https://avsox.asia/cn/search/' + number)
+    html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+    result1 = str(html.xpath('//*[@id="waterfall"]/div/a/@href')).strip(" ['']")
+    if result1 == '' or result1 == 'null' or result1 == 'None':
+        a = get_html('https://avsox.asia/cn/search/' + number.replace('-', '_'))
+        print(a)
+        html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+        result1 = str(html.xpath('//*[@id="waterfall"]/div/a/@href')).strip(" ['']")
+        if result1 == '' or result1 == 'null' or result1 == 'None':
+            a = get_html('https://avsox.asia/cn/search/' + number.replace('_', ''))
+            print(a)
+            html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
+            result1 = str(html.xpath('//*[@id="waterfall"]/div/a/@href')).strip(" ['']")
+    web = get_html(result1)
+    soup = BeautifulSoup(web, 'lxml')
+    info = str(soup.find(attrs={'class': 'row movie'}))
+    dic = {
+        'actor': getActor(web),
+        'title': getTitle(web).strip(getNum(web)),
+        'studio': getStudio(info),
+        'outline': '',#
+        'runtime': getRuntime(info),
+        'director': '', #
+        'release': getRelease(info),
+        'number': getNum(info),
+        'cover': getCover(web),
+        'cover_small': getCover_small(a),
+        'imagecut': 3,
+        'tag': getTag(web),
+        'label': getLabel(info),
+        'year': getYear(getRelease(info)),  # str(re.search('\d{4}',getRelease(a)).group()),
+        'actor_photo': getActorPhoto(web),
+        'website': result1,
+        'source': 'avsox.py',
+    }
+    js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
+    return js
+
+#print(main('041516_541'))

config.ini

@@ -1,12 +1,23 @@
+[common]
+main_mode=1
+failed_output_folder=failed
+success_output_folder=JAV_output
+
 [proxy]
 proxy=127.0.0.1:1080
 timeout=10
 retry=3
 
 [Name_Rule]
-location_rule='JAV_output/'+actor+'/'+number
+location_rule=actor+'/'+number
 naming_rule=number+'-'+title
 
 [update]
 update_check=1
-#on=1,off=0
+
+[media]
+media_warehouse=emby
+#emby or plex
+
+[directory_capture]
+directory=

core.py

@@ -1,19 +1,30 @@
+# -*- coding: utf-8 -*-
+
 import re
 import os
 import os.path
 import shutil
 from PIL import Image
 import time
-import javbus
 import json
-import fc2fans_club
-import siro
 from ADC_function import *
 from configparser import ConfigParser
 import argparse
+#=========website========
+import fc2fans_club
+import siro
+import avsox
+import javbus
 import javdb
+#=========website========
 
 #初始化全局变量
+Config = ConfigParser()
+Config.read(config_file, encoding='UTF-8')
+try:
+    option = ReadMediaWarehouse()
+except:
+    print('[-]Config media_warehouse read failed!')
 title=''
 studio=''
 year=''
@@ -28,26 +39,25 @@ cover=''
 imagecut=''
 tag=[]
 cn_sub=''
+multi_part=0
+part=''
 path=''
 houzhui=''
 website=''
 json_data={}
 actor_photo={}
+cover_small=''
 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,12 +66,17 @@ 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 getDataState(json_data): #元数据获取失败检测
+    if json_data['title'] == '' or json_data['title'] == 'None' or json_data['title'] == 'null':
+        return 0
+    else:
+        return 1
 def getDataFromJSON(file_number): #从JSON返回元数据
     global title
     global studio
@@ -80,28 +95,41 @@ def getDataFromJSON(file_number): #从JSON返回元数据
     global cn_sub
     global website
     global actor_photo
+    global cover_small
+    global json_data
 
     global naming_rule
     global location_rule
 
-
     # ================================================网站规则添加开始================================================
 
-    try:    # 添加 需要 正则表达式的规则
+    if re.match('^\d{5,}', file_number):
-        # =======================javdb.py=======================
+        json_data = json.loads(avsox.main(file_number))
-        if re.search('^\d{5,}', file_number).group() in file_number:
+        if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
-            json_data = json.loads(javbus.main_uncensored(file_number))
+            json_data = json.loads(javdb.main(file_number))
-    except:  # 添加 无需 正则表达式的规则
+    #==
-        # ====================fc2fans_club.py====================
+    elif re.match('\d+\D+', file_number):
-        if 'fc2' in file_number:
+        json_data = json.loads(siro.main(file_number))
-            json_data = json.loads(fc2fans_club.main(
+        if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
-                file_number.strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-').strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-')))
+            json_data = json.loads(javbus.main(file_number))
-        elif 'FC2' in file_number:
+        elif getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
-            json_data = json.loads(fc2fans_club.main(
+            json_data = json.loads(javdb.main(file_number))
-                file_number.strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-').strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-')))
+    # ==
-        # =======================javbus.py=======================
+    elif 'fc2' in file_number or 'FC2' in file_number:
+        json_data = json.loads(fc2fans_club.main(file_number))
+    # ==
+    elif 'HEYZO' in number or 'heyzo' in number or 'Heyzo' in number:
+        json_data = json.loads(avsox.main(file_number))
+    # ==
+    elif 'siro' in file_number or 'SIRO' in file_number or 'Siro' in file_number:
+        json_data = json.loads(siro.main(file_number))
+    # ==
     else:
         json_data = json.loads(javbus.main(file_number))
+        if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
+            json_data = json.loads(avsox.main(file_number))
+        elif getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
+            json_data = json.loads(javdb.main(file_number))
 
     # ================================================网站规则添加结束================================================
 
@@ -115,53 +143,69 @@ def getDataFromJSON(file_number): #从JSON返回元数据
     release     =     json_data['release']
     number      =     json_data['number']
     cover       =     json_data['cover']
+    try:
+        cover_small = json_data['cover_small']
+    except:
+        cover_small=''
     imagecut    =     json_data['imagecut']
-    tag         = str(json_data['tag']).strip("[ ]").replace("'", '').replace(" ", '').split(',')  # 字符串转列表
+    tag         = str(json_data['tag']).strip("[ ]").replace("'", '').replace(" ", '').split(',')  # 字符串转列表 @
     actor       = str(actor_list).strip("[ ]").replace("'", '').replace(" ", '')
     actor_photo =     json_data['actor_photo']
     website     =     json_data['website']
+    source      =     json_data['source']
 
     if title == '' or number == '':
         print('[-]Movie Data not found!')
         moveFailedFolder()
 
+    if imagecut == '3':
+        DownloadFileWithFilename()
+
+
     # ====================处理异常字符====================== #\/:*?"<>|
-    if '\\' in title:
     title = title.replace('\\', '')
-    elif '/' in title:
     title = title.replace('/', '')
-    elif ':' in title:
+    title = title.replace(':', '')
-        title=title.replace('/', '')
-    elif '*' in title:
     title = title.replace('*', '')
-    elif '?' in title:
     title = title.replace('?', '')
-    elif '"' in title:
     title = title.replace('"', '')
-    elif '<' in title:
     title = title.replace('<', '')
-    elif '>' in title:
     title = title.replace('>', '')
-    elif '|' in title:
     title = title.replace('|', '')
     # ====================处理异常字符 END================== #\/:*?"<>|
 
     naming_rule   = eval(config['Name_Rule']['naming_rule'])
     location_rule = eval(config['Name_Rule']['location_rule'])
+def smallCoverCheck():
+    if imagecut == 3:
+        if option == 'emby':
+            DownloadFileWithFilename(cover_small, '1.jpg', path)
+            img = Image.open(path + '/1.jpg')
+            w = img.width
+            h = img.height
+            img.save(path + '/' + number + '.png')
+            time.sleep(1)
+            os.remove(path + '/1.jpg')
+        if option == 'plex':
+            DownloadFileWithFilename(cover_small, '1.jpg', path)
+            img = Image.open(path + '/1.jpg')
+            w = img.width
+            h = img.height
+            img.save(path + '/poster.png')
+            os.remove(path + '/1.jpg')
 def creatFolder(): #创建文件夹
     global actor
     global path
-    if len(actor) > 240:                    #新建成功输出文件夹
+    if len(os.getcwd()+path) > 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)
 #=====================资源下载部分===========================
@@ -219,6 +263,12 @@ def imageDownload(filepath): #封面是否下载成功，否则移动到failed
         if DownloadFileWithFilename(cover, number + '.jpg', path) == 'failed':
             moveFailedFolder()
         DownloadFileWithFilename(cover, number + '.jpg', path)
+        if multi_part == 1:
+            old_name = os.path.join(path, number + '.jpg')
+            new_name = os.path.join(path, number + part + '.jpg')
+            os.rename(old_name, new_name)
+            print('[+]Image Downloaded!', path + '/' + number + part + '.jpg')
+        else:
             print('[+]Image Downloaded!', path + '/' + number + '.jpg')
     elif option == 'plex':
         if DownloadFileWithFilename(cover, 'fanart.jpg', path) == 'failed':
@@ -226,10 +276,6 @@ def imageDownload(filepath): #封面是否下载成功，否则移动到failed
         DownloadFileWithFilename(cover, 'fanart.jpg', path)
         print('[+]Image Downloaded!', path + '/fanart.jpg')
 def PrintFiles(filepath):
-    #global path
-    global title
-    global cn_sub
-    global actor_photo
     try:
         if not os.path.exists(path):
             os.makedirs(path)
@@ -263,12 +309,12 @@ def PrintFiles(filepath):
                 if cn_sub == '1':
                     print("  <tag>中文字幕</tag>", file=code)
                 try:
-                    for i in tag:
+                    for i in str(json_data['tag']).strip("[ ]").replace("'", '').replace(" ", '').split(','):
                         print("  <tag>" + i + "</tag>", file=code)
                 except:
                     aaaaa = ''
                 try:
-                    for i in tag:
+                    for i in str(json_data['tag']).strip("[ ]").replace("'", '').replace(" ", '').split(','):
                         print("  <genre>" + i + "</genre>", file=code)
                 except:
                     aaaaaaaa = ''
@@ -347,7 +393,7 @@ def cutImage():
                 img2.save(path + '/poster.png')
             except:
                 print('[-]Cover cut failed!')
-        else:
+        elif imagecut == 0:
             img = Image.open(path + '/fanart.jpg')
             w = img.width
             h = img.height
@@ -363,7 +409,7 @@ def cutImage():
                 img2.save(path + '/' + number + '.png')
             except:
                 print('[-]Cover cut failed!')
-        else:
+        elif imagecut == 0:
             img = Image.open(path + '/' + number + '.jpg')
             w = img.width
             h = img.height
@@ -372,25 +418,54 @@ 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)
-    try:
+    except PermissionError:
-        shutil.move(number + houzhui, path)
+        print('[-]Error! Please run as administrator!')
-    except:
-        print('[-]File Exists! Please check your movie!')
-        print('[-]move to the root folder of the program.')
         os._exit(0)
 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')
+def renameBackdropToJpg_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 + '/Backdrop.jpg', path + '/' + number + '.jpg')
+        print('[+]Image Downloaded!', path + '/' + number + '.jpg')
+def get_part(filepath):
+    try:
+        if re.search('-CD\d+', filepath):
+            return re.findall('-CD\d+', filepath)[0]
+    except:
+        print("[-]failed!Please rename the filename again!")
+        moveFailedFolder()
+def debug_mode():
+    try:
+        if config['debug_mode']['switch'] == '1':
+            print('[+] ---Debug info---')
+            for i, v in json_data.items():
+                if i == 'outline':
+                    print('[+] -', i, ':', len(v), 'characters')
+                    continue
+                if i == 'actor_photo' or i == 'year':
+                    continue
+                print('[+] -', i, ':', v)
+            print('[+] ---Debug info---')
+    except:
+        aaa=''
 if __name__ == '__main__':
     filepath=argparse_get_file()[0] #影片的路径
 
+    if '-CD' in filepath or '-cd' in filepath:
+        multi_part = 1
+    part = get_part(filepath)
     if '-c.' in filepath or '-C.' in filepath or '中文' in filepath or '字幕' in filepath:
         cn_sub='1'
 
@@ -405,9 +480,20 @@ if __name__ == '__main__':
         number = argparse_get_file()[1]
     CreatFailedFolder()
     getDataFromJSON(number)  # 定义番号
+    debug_mode()
     creatFolder()  # 创建文件夹
+    if program_mode == '1':
+        if part == '-CD1' or multi_part == 0:
+            smallCoverCheck()
             imageDownload(filepath)  # creatFoder会返回番号路径
+            if multi_part == 1:
+                number += part
             PrintFiles(filepath)  # 打印文件
             cutImage()  # 裁剪图
-    pasteFileToFolder(filepath, path)  # 移动文件
             renameJpgToBackdrop_copy()
+        else:
+            number += part
+            renameBackdropToJpg_copy()
+        pasteFileToFolder(filepath, path)  # 移动文件
+    elif program_mode == '2':
+        pasteFileToFolder(filepath, path)  # 移动文件

fc2fans_club.py

@@ -4,51 +4,43 @@ import json
 import ADC_function
 
 def getTitle(htmlcode): #获取厂商
-    #print(htmlcode)
     html = etree.fromstring(htmlcode,etree.HTMLParser())
-    result = str(html.xpath('/html/body/div[2]/div/div[1]/h3/text()')).strip(" ['']")
+    result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[1]/h2/text()')).strip(" ['']")
-    result2 = str(re.sub('\D{2}2-\d+','',result)).replace(' ','',1)
+    return result
-    #print(result2)
-    return result2
 def getActor(htmlcode):
     try:
         html = etree.fromstring(htmlcode, etree.HTMLParser())
-        result = str(html.xpath('/html/body/div[2]/div/div[1]/h5[5]/a/text()')).strip(" ['']")
+        result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[1]/div/div[2]/dl/dd[5]/a/text()')).strip(" ['']")
         return result
     except:
         return ''
 def getStudio(htmlcode): #获取厂商
+    try:
         html = etree.fromstring(htmlcode, etree.HTMLParser())
-    result = str(html.xpath('/html/body/div[2]/div/div[1]/h5[3]/a[1]/text()')).strip(" ['']")
+        result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[1]/div/div[2]/dl/dd[5]/a/text()')).strip(" ['']")
         return result
+    except:
+        return ''
 def getNum(htmlcode):     #获取番号
     html = etree.fromstring(htmlcode, etree.HTMLParser())
     result = str(html.xpath('/html/body/div[5]/div[1]/div[2]/p[1]/span[2]/text()')).strip(" ['']")
-    #print(result)
     return result
 def getRelease(htmlcode2): #
-    #a=ADC_function.get_html('http://adult.contents.fc2.com/article_search.php?id='+str(number).lstrip("FC2-").lstrip("fc2-").lstrip("fc2_").lstrip("fc2-")+'&utm_source=aff_php&utm_medium=source_code&utm_campaign=from_aff_php')
     html=etree.fromstring(htmlcode2,etree.HTMLParser())
     result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[1]/div/div[2]/dl/dd[4]/text()')).strip(" ['']")
     return result
-def getCover(htmlcode,number,htmlcode2): #获取厂商 #
+def getCover(htmlcode2): #获取厂商 #
-    #a = ADC_function.get_html('http://adult.contents.fc2.com/article_search.php?id=' + str(number).lstrip("FC2-").lstrip("fc2-").lstrip("fc2_").lstrip("fc2-") + '&utm_source=aff_php&utm_medium=source_code&utm_campaign=from_aff_php')
     html = etree.fromstring(htmlcode2, etree.HTMLParser())
     result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[1]/div/div[1]/a/img/@src')).strip(" ['']")
-    if result == '':
-        html = etree.fromstring(htmlcode, etree.HTMLParser())
-        result2 = str(html.xpath('//*[@id="slider"]/ul[1]/li[1]/img/@src')).strip(" ['']")
-        return 'http://fc2fans.club' +  result2
     return 'http:' + result
-def getOutline(htmlcode2,number):     #获取番号 #
+def getOutline(htmlcode2):     #获取番号 #
-    #a = ADC_function.get_html('http://adult.contents.fc2.com/article_search.php?id=' + str(number).lstrip("FC2-").lstrip("fc2-").lstrip("fc2_").lstrip("fc2-") + '&utm_source=aff_php&utm_medium=source_code&utm_campaign=from_aff_php')
     html = etree.fromstring(htmlcode2, etree.HTMLParser())
-    result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[4]/p/text()')).replace("\\n",'',10000).strip(" ['']").replace("'",'',10000)
+    result = str(html.xpath('//*[@id="container"]/div[1]/div/article/section[4]/p/text()')).strip(" ['']").replace("\\n",'',10000).replace("'",'',10000).replace(', ,','').strip('  ').replace('。,',',')
     return result
 def getTag(htmlcode):     #获取番号
     html = etree.fromstring(htmlcode, etree.HTMLParser())
-    result = str(html.xpath('/html/body/div[2]/div/div[1]/h5[4]/a/text()'))
+    result = html.xpath('//*[@id="container"]/div[1]/div/article/section[6]/ul/li/a/text()')
-    return result.strip(" ['']").replace("'",'').replace(' ','')
+    return result
 def getYear(release):
     try:
         result = re.search('\d{4}',release).group()
@@ -56,29 +48,28 @@ def getYear(release):
     except:
         return ''
 
-def main(number2):
+def main(number):
-    number=number2.replace('PPV','').replace('ppv','')
+    number=number.replace('PPV','').replace('ppv','').strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-').strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-').replace('fc2ppv-','').replace('FC2PPV-','')
-    htmlcode2 = ADC_function.get_html('http://adult.contents.fc2.com/article_search.php?id='+str(number).lstrip("FC2-").lstrip("fc2-").lstrip("fc2_").lstrip("fc2-")+'&utm_source=aff_php&utm_medium=source_code&utm_campaign=from_aff_php')
+    htmlcode2 = ADC_function.get_html('http://adult.contents.fc2.com/article_search.php?id='+str(number).lstrip("FC2-").lstrip("fc2-").lstrip("fc2_").lstrip("fc2-")+'')
-    htmlcode = ADC_function.get_html('http://fc2fans.club/html/FC2-' + number + '.html')
+    #htmlcode = ADC_function.get_html('http://fc2fans.club/html/FC2-' + number + '.html')
     dic = {
-        'title':    getTitle(htmlcode),
+        'title':    getTitle(htmlcode2),
-        'studio':   getStudio(htmlcode),
+        'studio':   getStudio(htmlcode2),
-        'year': '',#str(re.search('\d{4}',getRelease(number)).group()),
+        'year':     getYear(getRelease(htmlcode2)),
-        'outline':  getOutline(htmlcode,number),
+        'outline':  getOutline(htmlcode2),
-        'runtime':  getYear(getRelease(htmlcode)),
+        'runtime':  getYear(getRelease(htmlcode2)),
-        'director': getStudio(htmlcode),
+        'director': getStudio(htmlcode2),
-        'actor':    getActor(htmlcode),
+        'actor':    getStudio(htmlcode2),
-        'release':  getRelease(number),
+        'release':  getRelease(htmlcode2),
         'number':  'FC2-'+number,
-        'cover':    getCover(htmlcode,number,htmlcode2),
+        'cover':    getCover(htmlcode2),
         'imagecut': 0,
-        'tag':      getTag(htmlcode),
+        'tag':      getTag(htmlcode2),
         'actor_photo':'',
-        'website':  'http://fc2fans.club/html/FC2-' + number + '.html',
+        'website':  'http://adult.contents.fc2.com/article_search.php?id=' + number,
+        'source': 'fc2fans_club.py',
     }
-    #print(getTitle(htmlcode))
-    #print(getNum(htmlcode))
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'),)#.encode('UTF-8')
     return js
 
-#print(main('1051725'))
+#print(main('1145465'))

javbus.py

@@ -1,17 +1,9 @@
 import re
-import requests #need install
 from pyquery import PyQuery as pq#need install
 from lxml import etree#need install
-import os
-import os.path
-import shutil
 from bs4 import BeautifulSoup#need install
-from PIL import Image#need install
-import time
 import json
 from ADC_function import *
-import javdb
-import siro
 
 def getActorPhoto(htmlcode): #//*[@id="star_qdt"]/li/a/img
     soup = BeautifulSoup(htmlcode, 'lxml')
@@ -88,16 +80,12 @@ def getTag(htmlcode):  # 获取演员
 
 
 def main(number):
-    try:
-        if re.search('\d+\D+', number).group() in number or 'siro' in number or 'SIRO' in number or 'Siro' in number:
-            js = siro.main(number)
-            return js
-    except:
-        aaaa=''
-
     try:
         htmlcode = get_html('https://www.javbus.com/' + number)
+        try:
             dww_htmlcode = get_html("https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=" + number.replace("-", ''))
+        except:
+            dww_htmlcode = ''
         dic = {
             'title': str(re.sub('\w+-\d+-', '', getTitle(htmlcode))),
             'studio': getStudio(htmlcode),
@@ -114,35 +102,12 @@ def main(number):
             'label': getSerise(htmlcode),
             'actor_photo': getActorPhoto(htmlcode),
             'website': 'https://www.javbus.com/' + number,
+            'source' : 'javbus.py',
         }
         js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
-        if 'HEYZO' in number or 'heyzo' in number or 'Heyzo' in number:
-            htmlcode = get_html('https://www.javbus.com/' + number)
-            #dww_htmlcode = get_html("https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=" + number.replace("-", ''))
-            dic = {
-                'title': str(re.sub('\w+-\d+-', '', getTitle(htmlcode))),
-                'studio': getStudio(htmlcode),
-                'year': getYear(htmlcode),
-                'outline': '',
-                'runtime': getRuntime(htmlcode),
-                'director': getDirector(htmlcode),
-                'actor': getActor(htmlcode),
-                'release': getRelease(htmlcode),
-                'number': getNum(htmlcode),
-                'cover': getCover(htmlcode),
-                'imagecut': 1,
-                'tag': getTag(htmlcode),
-                'label': getSerise(htmlcode),
-                'actor_photo': getActorPhoto(htmlcode),
-                'website': 'https://www.javbus.com/' + number,
-            }
-            js2 = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4,
-                             separators=(',', ':'), )  # .encode('UTF-8')
-            return js2
         return js
     except:
-        a=javdb.main(number)
+        return main_uncensored(number)
-        return a
 
 def main_uncensored(number):
     htmlcode = get_html('https://www.javbus.com/' + number)
@@ -166,11 +131,7 @@ def main_uncensored(number):
         'imagecut': 0,
         'actor_photo': '',
         'website': 'https://www.javbus.com/' + number,
+        'source': 'javbus.py',
     }
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
-
-    if getYear(htmlcode) == '' or getYear(htmlcode) == 'null':
-        js2 = javdb.main(number)
-        return js2
-
     return js

javdb.py

@@ -1,7 +1,6 @@
 import re
 from lxml import etree
 import json
-import requests
 from bs4 import BeautifulSoup
 from ADC_function import *
 
@@ -79,7 +78,6 @@ def main(number):
             result1 = str(html.xpath('//*[@id="videos"]/div/div/a/@href')).strip(" ['']")
         b = get_html('https://javdb1.com' + result1)
         soup = BeautifulSoup(b, 'lxml')
-
         a = str(soup.find(attrs={'class': 'panel'}))
         dic = {
             'actor': getActor(a),
@@ -99,6 +97,7 @@ def main(number):
             'year': getYear(getRelease(a)),  # str(re.search('\d{4}',getRelease(a)).group()),
             'actor_photo': '',
             'website': 'https://javdb1.com' + result1,
+            'source': 'javdb.py',
         }
         js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'), )  # .encode('UTF-8')
         return js
@@ -106,18 +105,17 @@ def main(number):
         a = get_html('https://javdb.com/search?q=' + number + '&f=all')
         html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
         result1 = str(html.xpath('//*[@id="videos"]/div/div/a/@href')).strip(" ['']")
-        if result1 == '':
+        if result1 == '' or result1 == 'null':
             a = get_html('https://javdb.com/search?q=' + number.replace('-', '_') + '&f=all')
             html = etree.fromstring(a, etree.HTMLParser())  # //table/tr[1]/td[1]/text()
             result1 = str(html.xpath('//*[@id="videos"]/div/div/a/@href')).strip(" ['']")
-
         b = get_html('https://javdb.com' + result1)
         soup = BeautifulSoup(b, 'lxml')
-
         a = str(soup.find(attrs={'class': 'panel'}))
         dic = {
             'actor': getActor(a),
-            'title': getTitle(b).replace("\\n", '').replace('        ', '').replace(getActor(a), '').replace(getNum(a),
+            'title': getTitle(b).replace("\\n", '').replace('        ', '').replace(getActor(a), '').replace(
+                getNum(a),
                 '').replace(
                 '无码', '').replace('有码', '').lstrip(' '),
             'studio': getStudio(a),
@@ -133,6 +131,7 @@ def main(number):
             'year': getYear(getRelease(a)),  # str(re.search('\d{4}',getRelease(a)).group()),
             'actor_photo': '',
             'website': 'https://javdb.com' + result1,
+            'source': 'javdb.py',
         }
         js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4,separators=(',', ':'), )  # .encode('UTF-8')
         return js

siro.py

@@ -1,7 +1,6 @@
 import re
 from lxml import etree
 import json
-import requests
 from bs4 import BeautifulSoup
 from ADC_function import *
 
@@ -97,6 +96,7 @@ def main(number2):
         'year': getYear(getRelease(a)),  # str(re.search('\d{4}',getRelease(a)).group()),
         'actor_photo': '',
         'website':'https://www.mgstage.com/product/product_detail/'+str(number)+'/',
+        'source': 'siro.py',
     }
     js = json.dumps(dic, ensure_ascii=False, sort_keys=True, indent=4, separators=(',', ':'),)#.encode('UTF-8')
     return js

update_check.json

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