Merge pull request #743 from lededev/rating-2

KODI评分显示投票人数

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']:

WebCrawler/madou.py

@@ -19,9 +19,10 @@ def getTitle(html):  # 获取标题
     # <title>MD0140-2 / 家有性事EP2 爱在身边-麻豆社</title>
     # <title>MAD039 机灵可爱小叫花 强诱僧人迫犯色戒-麻豆社</title>
     # <title>MD0094／贫嘴贱舌中出大嫂／坏嫂嫂和小叔偷腥内射受孕-麻豆社</title>
+    # <title>TM0002-我的痴女女友-麻豆社</title>
     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'))

core.py

@@ -355,10 +355,17 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f
             print("  <releasedate>" + release + "</releasedate>", file=code)
             print("  <release>" + release + "</release>", file=code)
             try:
-                f_rating = float(json_data['userrating'])
-                print(f"  <userrating>{round(f_rating * 2.0)}</userrating>", file=code)
-                print(f"  <rating>{round(f_rating * 2.0, 1)}</rating>", file=code)
-                print(f"  <criticrating>{round(f_rating * 20.0, 1)}</criticrating>", file=code)
+                f_rating = json_data['用户评分']
+                uc = json_data['评分人数']
+                print(f"""  <userrating>{round(f_rating * 2.0)}</userrating>
+  <rating>{round(f_rating * 2.0, 1)}</rating>
+  <criticrating>{round(f_rating * 20.0, 1)}</criticrating>
+  <ratings>
+    <rating name="javdb" max="5" default="true">
+      <value>{f_rating}</value>
+      <votes>{uc}</votes>
+    </rating>
+  </ratings>""", file=code)
             except:
                 pass
             print("  <cover>" + cover + "</cover>", file=code)