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

app/src/main/java/com/github/catvod/ali/API.java

@@ -392,7 +392,7 @@ public class API {
     }
 
     public String playerContent(String[] ids) {
-        return Result.get().url(getDownloadUrl(ids[0])).subs(getSubs(ids)).header(getHeader()).string();
+        return Result.get().url(getDownloadUrl(ids[0])).octet().subs(getSubs(ids)).header(getHeader()).string();
     }
 
     public String playerContent(String[] ids, String flag) {
@@ -401,7 +401,7 @@ public class API {
             String url = getPreviewUrl(playInfo, flag);
             List<Sub> subs = getSubs(ids);
             subs.addAll(getSubs(playInfo));
-            return Result.get().url(url).subs(subs).header(getHeader()).string();
+            return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string();
         } catch (Exception e) {
             e.printStackTrace();
             return Result.get().url("").string();

app/src/main/java/com/github/catvod/bean/Result.java

@@ -23,6 +23,8 @@ public class Result {
     private LinkedHashMap<String, List<Filter>> filters;
     @SerializedName("header")
     private String header;
+    @SerializedName("format")
+    private String format;
     @SerializedName("url")
     private String url;
     @SerializedName("subs")
@@ -129,11 +131,36 @@ public class Result {
         return this;
     }
 
+    public Result format(String format) {
+        this.format = format;
+        return this;
+    }
+
     public Result subs(List<Sub> subs) {
         this.subs = subs;
         return this;
     }
 
+    public Result dash() {
+        this.format = "application/dash+xml";
+        return this;
+    }
+
+    public Result m3u8() {
+        this.format = "application/x-mpegURL";
+        return this;
+    }
+
+    public Result rtsp() {
+        this.format = "application/x-rtsp";
+        return this;
+    }
+
+    public Result octet() {
+        this.format = "application/octet-stream";
+        return this;
+    }
+
     public Result page() {
         return page(1, 1, 0, 1);
     }

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

@@ -27,7 +27,7 @@ public class Local extends Spider {
 
     @Override
     public void init(Context context, String extend) {
-        format = new SimpleDateFormat("yyyyy/MM/dd HH:mm:ss", Locale.getDefault());
+        format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.getDefault());
     }
 
     @Override

jar/custom_spider.jar.md5

@@ -1 +1 @@
-5293550a292d61fd7318571385c4fc11
+b7931872492dbe98f688172bb9382a25

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5293550a292d61fd7318571385c4fc11",
+  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b7931872492dbe98f688172bb9382a25",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5293550a292d61fd7318571385c4fc11",
+  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b7931872492dbe98f688172bb9382a25",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {