Merge branch 'main' of https://github.com/FongMi/CatVodSpider

app/build.gradle

@@ -39,7 +39,7 @@ dependencies {
     implementation('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' }
     implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
     implementation('com.squareup.okhttp3:okhttp:3.12.13') { force = true }
-    implementation 'wang.harlon.quickjs:wrapper-android:0.20.2'
+    implementation 'wang.harlon.quickjs:wrapper-android:0.21.1'
     implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'cn.wanghaomiao:JsoupXpath:2.5.1'

app/src/main/java/com/github/catvod/net/OkRequest.java

@@ -2,7 +2,6 @@ package com.github.catvod.net;
 
 import android.text.TextUtils;
 
-import com.github.catvod.crawler.SpiderDebug;
 import com.github.catvod.utils.Utils;
 
 import java.io.IOException;
@@ -77,12 +76,8 @@ class OkRequest {
             Response response = client.newCall(request).execute();
             if (respHeader != null) respHeader.clear();
             if (respHeader != null) respHeader.putAll(response.headers().toMultimap());
-            int code = response.code();
+            return new OkResult(response.code(), response.body().string());
-            String body = response.body().string();
-            SpiderDebug.log(code + "," + body);
-            return new OkResult(code, body);
         } catch (IOException e) {
-            SpiderDebug.log(e);
             return new OkResult();
         }
     }

jar/custom_spider.jar.md5

@@ -1 +1 @@
-9a8ad560e957f4016cf6553605039491
+dede7a67d11523b79d649c152910fd6a

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;9a8ad560e957f4016cf6553605039491",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;dede7a67d11523b79d649c152910fd6a",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;9a8ad560e957f4016cf6553605039491",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;dede7a67d11523b79d649c152910fd6a",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {
@@ -106,88 +106,21 @@
       "searchable": 1,
       "changeable": 1
     },
+    {
+      "key": "暴風",
+      "name": "暴風",
+      "type": 1,
+      "api": "https://bfzyapi.com/api.php/provide/vod/?ac=list",
+      "searchable": 1,
+      "changeable": 1
+    },
     {
       "key": "量子",
       "name": "量子",
       "type": 0,
       "api": "https://cj.lziapi.com/api.php/provide/vod/at/xml/",
       "searchable": 1,
-      "changeable": 1,
+      "changeable": 1
-      "categories": [
-        "国产动漫",
-        "日韩动漫",
-        "国产剧",
-        "韩国剧",
-        "日本剧",
-        "电影片",
-        "连续剧",
-        "综艺片",
-        "动漫片",
-        "动作片",
-        "喜剧片",
-        "爱情片",
-        "科幻片",
-        "恐怖片",
-        "剧情片",
-        "战争片",
-        "台湾剧",
-        "香港剧",
-        "欧美剧",
-        "记录片",
-        "海外剧",
-        "泰国剧",
-        "大陆综艺",
-        "港台综艺",
-        "日韩综艺",
-        "欧美综艺",
-        "欧美动漫",
-        "港台动漫",
-        "海外动漫",
-        "体育",
-        "足球",
-        "篮球",
-        "网球",
-        "斯诺克"
-      ]
-    },
-    {
-      "key": "非凡",
-      "name": "非凡",
-      "type": 0,
-      "api": "http://cj.ffzyapi.com/api.php/provide/vod/at/xml/",
-      "searchable": 1,
-      "changeable": 1,
-      "categories": [
-        "国产动漫",
-        "日韩动漫",
-        "国产剧",
-        "韩国剧",
-        "日本剧",
-        "电影片",
-        "连续剧",
-        "综艺片",
-        "动漫片",
-        "动作片",
-        "喜剧片",
-        "爱情片",
-        "科幻片",
-        "恐怖片",
-        "剧情片",
-        "战争片",
-        "香港剧",
-        "欧美剧",
-        "记录片",
-        "台湾剧",
-        "海外剧",
-        "泰国剧",
-        "大陆综艺",
-        "港台综艺",
-        "日韩综艺",
-        "欧美综艺",
-        "欧美动漫",
-        "港台动漫",
-        "海外动漫"
-      ]
     },
     {
       "key": "櫻花",
@@ -316,6 +249,15 @@
     }
   ],
   "rules": [
+    {
+      "name": "暴風",
+      "hosts": [
+        "bfzy"
+      ],
+      "regex": [
+        "#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:3,[\\s\\S]*?#EXT-X-DISCONTINUITY"
+      ]
+    },
     {
       "name": "星星",
       "hosts": [
@@ -326,7 +268,7 @@
       ]
     },
     {
-      "name": "量子廣告",
+      "name": "量子",
       "hosts": [
         "vip.lz",
         "hd.lz"
@@ -337,7 +279,7 @@
       ]
     },
     {
-      "name": "非凡廣告",
+      "name": "非凡",
       "hosts": [
         "vip.ffzy",
         "hd.ffzy"