Beta 11.2 Update
This commit is contained in:
parent
07c8a7fb0e
commit
c0303a57a1
@ -36,19 +36,13 @@ def get_html(url,cookies = None):#网页请求核心
|
||||
while i < retry_count:
|
||||
try:
|
||||
if not str(config['proxy']['proxy']) == '':
|
||||
proxies = {
|
||||
"http": "http://" + str(config['proxy']['proxy']),
|
||||
"https": "https://" + str(config['proxy']['proxy'])
|
||||
}
|
||||
headers = {
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3100.0 Safari/537.36'}
|
||||
proxies = {"http": "http://" + str(config['proxy']['proxy']),"https": "https://" + str(config['proxy']['proxy'])}
|
||||
headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3100.0 Safari/537.36'}
|
||||
getweb = requests.get(str(url), headers=headers, timeout=int(config['proxy']['timeout']),proxies=proxies, cookies=cookies)
|
||||
getweb.encoding = 'utf-8'
|
||||
# print(getweb.text)
|
||||
return getweb.text
|
||||
else:
|
||||
headers = {
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36'}
|
||||
headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36'}
|
||||
getweb = requests.get(str(url), headers=headers, timeout=int(config['proxy']['timeout']), cookies=cookies)
|
||||
getweb.encoding = 'utf-8'
|
||||
return getweb.text
|
||||
|
@ -76,8 +76,6 @@ def getNumber(filepath):
|
||||
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()
|
||||
if '-C.' in filepath or '-c.' in filepath:
|
||||
cn_sub = '1'
|
||||
return file_number
|
||||
except: # 提取不含减号-的番号
|
||||
try: # 提取东京热番号格式 n1087
|
||||
@ -127,7 +125,8 @@ if __name__ =='__main__':
|
||||
print('[!] - '+percentage+' ['+str(count)+'/'+count_all+'] -')
|
||||
print("[!]Making Data for [" + i + "],the number is [" + getNumber(i) + "]")
|
||||
os.system('python core.py' + ' "' + i + '" --number "'+getNumber(i)+'"') #选择从py文件启动 (用于源码py)
|
||||
#os.system('core.exe' + ' "' + i + '" --number "'+getNumber(i)+'"') #选择从exe文件启动(用于EXE版程序)
|
||||
#print('core.exe' + ' "' + i + '" --number "'+getNumber(i)+'"') #选择从exe文件启动(用于EXE版程序
|
||||
#print()
|
||||
print("[*]=====================================")
|
||||
|
||||
CEF('JAV_output')
|
||||
|
5
core.py
5
core.py
@ -71,9 +71,6 @@ def getDataFromJSON(file_number): #从JSON返回元数据
|
||||
# =======================javdb.py=======================
|
||||
if re.search('^\d{5,}', file_number).group() in file_number:
|
||||
json_data = json.loads(javdb.main(file_number))
|
||||
# ======================siro.py==========================
|
||||
elif re.search('\d+\D+', file_number).group() in file_number:
|
||||
json_data = json.loads(siro.main(file_number))
|
||||
except: # 添加 无需 正则表达式的规则
|
||||
# ====================fc2fans_club.py====================
|
||||
if 'fc2' in file_number:
|
||||
@ -95,7 +92,7 @@ def getDataFromJSON(file_number): #从JSON返回元数据
|
||||
outline = json_data['outline']
|
||||
runtime = json_data['runtime']
|
||||
director = json_data['director']
|
||||
actor_list = str(json_data['actor']).strip("[ ]").replace("'", '').replace(" ", '').split(',') # 字符串转列表
|
||||
actor_list = str(json_data['actor']).strip("[ ]").replace("'", '').split(',') # 字符串转列表
|
||||
release = json_data['release']
|
||||
number = json_data['number']
|
||||
cover = json_data['cover']
|
||||
|
@ -11,6 +11,7 @@ import time
|
||||
import json
|
||||
from ADC_function import *
|
||||
import javdb
|
||||
import siro
|
||||
|
||||
def getTitle(htmlcode): #获取标题
|
||||
doc = pq(htmlcode)
|
||||
@ -75,6 +76,13 @@ def getTag(htmlcode): # 获取演员
|
||||
|
||||
|
||||
def main(number):
|
||||
try:
|
||||
if re.search('\d+\D+', number).group() in number:
|
||||
js = siro.main(number)
|
||||
return js
|
||||
except:
|
||||
aaaa=''
|
||||
|
||||
try:
|
||||
htmlcode = get_html('https://www.javbus.com/' + number)
|
||||
dww_htmlcode = get_html("https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=" + number.replace("-", ''))
|
||||
|
@ -4,7 +4,7 @@ timeout=10
|
||||
retry=3
|
||||
|
||||
[Name_Rule]
|
||||
location_rule='JAV_output/'+actor+'/['+number+']-'+title
|
||||
location_rule='JAV_output/'+actor+'/'+number
|
||||
naming_rule=number+'-'+title
|
||||
|
||||
[update]
|
||||
|
Loading…
Reference in New Issue
Block a user