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

app/src/main/java/com/github/catvod/spider/Bili.java

@@ -135,6 +135,7 @@ public class Bili extends Spider {
     public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
         String order = extend.containsKey("order") ? extend.get("order") : "totalrank";
         String duration = extend.containsKey("duration") ? extend.get("duration") : "0";
+        tid = extend.containsKey("tid") ? extend.get("tid") : tid;
         String api = "https://api.bilibili.com/x/web-interface/search/type?search_type=video&keyword=" + URLEncoder.encode(tid) + "&order=" + order + "&duration=" + duration + "&page=" + pg;
         String json = OkHttp.string(api, getGuest());
         Resp resp = Resp.objectFrom(json);

jar/custom_spider.jar.md5

@@ -1 +1 @@
-edae7af0ef2089cfc135c90ce085aacd
+6634431a04b488e0984e752918316382

json/adult.json

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

json/bili.json

@@ -38,5 +38,149 @@
     }
   ],
   "filters": {
+    "帕梅拉": [
+      {
+        "key": "order",
+        "name": "排序",
+        "value": [
+          {
+            "n": "综合排序",
+            "v": "0"
+          },
+          {
+            "n": "最多点击",
+            "v": "click"
+          },
+          {
+            "n": "最新发布",
+            "v": "pubdate"
+          },
+          {
+            "n": "最多弹幕",
+            "v": "dm"
+          },
+          {
+            "n": "最多收藏",
+            "v": "stow"
+          }
+        ]
+      },
+      {
+        "key": "duration",
+        "name": "时长",
+        "value": [
+          {
+            "n": "全部",
+            "v": "0"
+          },
+          {
+            "n": "60分钟以上",
+            "v": "4"
+          },
+          {
+            "n": "30~60分钟",
+            "v": "3"
+          },
+          {
+            "n": "10~30分钟",
+            "v": "2"
+          },
+          {
+            "n": "10分钟以下",
+            "v": "1"
+          }
+        ]
+      },
+      {
+        "key": "tid",
+        "name": "分类",
+        "value": [
+          {
+            "n": "全部",
+            "v": "帕梅拉"
+          },
+          {
+            "n": "帕梅拉合集",
+            "v": "帕梅拉合集"
+          },
+          {
+            "n": "Pamela Reif",
+            "v": "Pamela Reif"
+          }
+        ]
+      }
+    ],
+    "太极拳": [
+      {
+        "key": "order",
+        "name": "排序",
+        "value": [
+          {
+            "n": "综合排序",
+            "v": "0"
+          },
+          {
+            "n": "最多点击",
+            "v": "click"
+          },
+          {
+            "n": "最新发布",
+            "v": "pubdate"
+          },
+          {
+            "n": "最多弹幕",
+            "v": "dm"
+          },
+          {
+            "n": "最多收藏",
+            "v": "stow"
+          }
+        ]
+      },
+      {
+        "key": "duration",
+        "name": "时长",
+        "value": [
+          {
+            "n": "全部",
+            "v": "0"
+          },
+          {
+            "n": "60分钟以上",
+            "v": "4"
+          },
+          {
+            "n": "30~60分钟",
+            "v": "3"
+          },
+          {
+            "n": "10~30分钟",
+            "v": "2"
+          },
+          {
+            "n": "10分钟以下",
+            "v": "1"
+          }
+        ]
+      },
+      {
+        "key": "tid",
+        "name": "分类",
+        "value": [
+          {
+            "n": "全部",
+            "v": "太极拳"
+          },
+          {
+            "n": "太极拳合集",
+            "v": "太极拳合集"
+          },
+          {
+            "n": "太极拳五连鞭",
+            "v": "太极拳五连鞭"
+          }
+        ]
+      }
+    ]
   }
 }

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;edae7af0ef2089cfc135c90ce085aacd",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;6634431a04b488e0984e752918316382",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {