diff --git a/WebCrawler/javdb.py b/WebCrawler/javdb.py
index 7bb6f3a..a0d8a38 100755
--- a/WebCrawler/javdb.py
+++ b/WebCrawler/javdb.py
@@ -175,7 +175,8 @@ def getSeries(html):
def getUserRating(html):
try:
result = str(html.xpath('//span[@class="score-stars"]/../text()')[0])
- return result[:result.find('分')].strip()
+ v = re.findall(r'(\d+|\d+\.\d+)分, 由(\d+)人評價', result)
+ return float(v[0][0]), int(v[0][1])
except:
return
@@ -302,8 +303,9 @@ def main(number):
}
userrating = getUserRating(lx)
- if userrating:
- dic['userrating'] = userrating
+ if isinstance(userrating, tuple) and len(userrating) == 2:
+ dic['用户评分'] = userrating[0]
+ dic['评分人数'] = userrating[1]
if not dic['actor'] and re.match(r'FC2-[\d]+', number, re.A):
dic['actor'].append('素人')
if not dic['series']:
diff --git a/WebCrawler/madou.py b/WebCrawler/madou.py
index 57be3ea..6cf9132 100644
--- a/WebCrawler/madou.py
+++ b/WebCrawler/madou.py
@@ -19,9 +19,10 @@ def getTitle(html): # 获取标题
#
MD0140-2 / 家有性事EP2 爱在身边-麻豆社
# MAD039 机灵可爱小叫花 强诱僧人迫犯色戒-麻豆社
# MD0094/贫嘴贱舌中出大嫂/坏嫂嫂和小叔偷腥内射受孕-麻豆社
+ # TM0002-我的痴女女友-麻豆社
browser_title = str(html.xpath("/html/head/title/text()")[0])
- title = str(re.findall(r'^.*?( / | |/)(.*)-麻豆社$', browser_title)[0][1]).strip()
- return title.replace('/', ' ')
+ title = str(re.findall(r'^[A-Z0-9 //\-]*(.*)-麻豆社$', browser_title)[0]).strip()
+ return title
def getStudio(html): # 获取厂商 已修改
try:
@@ -60,7 +61,6 @@ def getNum(url, number): # 获取番号
filename = unquote(urlparse(url).path)
# 裁剪文件名
result = filename[1:-5].upper().strip()
- print(result)
# 移除中文
if result.upper() != number.upper():
result = re.split(r'[^\x00-\x7F]+', result, 1)[0]
@@ -164,6 +164,8 @@ def main(number):
if __name__ == '__main__':
+ config.G_conf_override['debug_mode:switch'] = True
+ print(main('TM0002'))
print(main('MD0222'))
print(main('MD0140-2'))
print(main('MAD039'))
diff --git a/core.py b/core.py
index befa3d5..3a64c06 100644
--- a/core.py
+++ b/core.py
@@ -355,10 +355,17 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f
print(" " + release + "", file=code)
print(" " + release + "", file=code)
try:
- f_rating = float(json_data['userrating'])
- print(f" {round(f_rating * 2.0)}", file=code)
- print(f" {round(f_rating * 2.0, 1)}", file=code)
- print(f" {round(f_rating * 20.0, 1)}", file=code)
+ f_rating = json_data['用户评分']
+ uc = json_data['评分人数']
+ print(f""" {round(f_rating * 2.0)}
+ {round(f_rating * 2.0, 1)}
+ {round(f_rating * 20.0, 1)}
+
+
+ {f_rating}
+ {uc}
+
+ """, file=code)
except:
pass
print(" " + cover + "", file=code)