Merge branch 'FongMi:main' into main

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

@@ -84,17 +84,26 @@ public class Duanju extends Spider {
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
-        String detailUrl = ids.get(0);
+        Document doc = Jsoup.parse(OkHttp.string(ids.get(0), getHeader()));
-        Document doc = Jsoup.parse(OkHttp.string(detailUrl, getHeader()));
+        Elements circuits = doc.select(".module-tab-item.tab-item");
-        List<String> vodItems = new ArrayList<>();
+        Elements sources = doc.select("[class=scroll-content]"); 
-        Elements sourceList = doc.select(".scroll-content a");
+        StringBuilder vod_play_url = new StringBuilder();
-        for (Element a : sourceList) {
+        StringBuilder vod_play_from = new StringBuilder();
-            String episodeUrl = siteUrl + a.attr("href");
+        for (int i = 0; i < sources.size(); i++) {
-            String episodeName = a.text();
+            String spanText = circuits.get(i).select("span").text();
-            vodItems.add(episodeName + "$" + episodeUrl);
+            String smallText = circuits.get(i).select("small").text();
+            String playFromText = spanText + "(共" + smallText + "集)";
+            vod_play_from.append(playFromText).append("$$$");
+            Elements aElementArray = sources.get(i).select("a");
+            for (int j = 0; j < aElementArray.size(); j++) {
+                Element a = aElementArray.get(j);
+                String href = siteUrl + a.attr("href");
+                String text = a.text();
+                vod_play_url.append(text).append("$").append(href);
+                boolean notLastEpisode = j < aElementArray.size() - 1;
+                vod_play_url.append(notLastEpisode ? "#" : "$$$");
+            }
         }
-        String vod_play_from = "Qile";
-        String vod_play_url = TextUtils.join("#", vodItems);
         String title = doc.select("h1.page-title").text();
         String classifyName = doc.select("div.tag-link a").text();
         String year = doc.select("a.tag-link").eq(1).text();

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

@@ -77,7 +77,7 @@ public class Pan99 extends Ali {
     @Override
     public String detailContent(List<String> ids) throws Exception {
         Document doc = Jsoup.parse(OkHttp.string(ids.get(0), getHeader()));
-        List<String> shareLinks = doc.select("blockquote p a:not([href*=quark])").eachAttr("href");
+        List<String> shareLinks = doc.select(".card p a:not([href*=quark])").eachAttr("href");
         for (int i = 0; i < shareLinks.size(); i++) shareLinks.set(i, shareLinks.get(i).trim());
         String title = doc.select(".post-title.mb-2.mb-lg-3").text();
         String pic = doc.select("img.alignnone.size-medium").attr("src") + douban;
@@ -92,7 +92,7 @@ public class Pan99 extends Ali {
         Matcher matcher4 = Pattern.compile("◎类　　别(.*?)◎").matcher(doc.text());
         String classifyName = matcher4.find() ? matcher4.group(1) : "";
         Matcher matcher5 = Pattern.compile("◎集　　数(.*?)◎").matcher(doc.text());
-        String remark = matcher5.find() ? matcher5.group(1) : "";
+        String remark = matcher5.find() ? "集数：" + matcher5.group(1) : "";
         Matcher matcher6 = Pattern.compile("◎简　　介(.*?)资源失效").matcher(doc.text());
         String brief = matcher6.find() ? matcher6.group(1) : "";
         Vod vod = new Vod();

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

@@ -39,8 +39,8 @@ public class Push extends Spider {
     public String playerContent(String flag, String id, List<String> vipFlags) {
         if (id.startsWith("http") && id.contains("***")) id = id.replace("***", "#");
         if (flag.equals("直連")) return Result.get().url(id).subs(getSubs(id)).string();
-        if (flag.equals("嗅探")) return Result.get().parse().url(id).chrome().string();
         if (flag.equals("解析")) return Result.get().parse().jx().url(id).string();
+        if (flag.equals("嗅探")) return Result.get().parse().url(id).string();
         return ali.playerContent(flag, id, vipFlags);
     }
 

jar/custom_spider.jar.md5

@@ -1 +1 @@
-ca7cf8ac2302fa00985a57e4e58124ab
+6bf74e9b02f310ddcab9c460b7e0983c

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;ca7cf8ac2302fa00985a57e4e58124ab",
+  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;6bf74e9b02f310ddcab9c460b7e0983c",
   "wallpaper": "https://gao.chuqiuyu.workers.dev",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;ca7cf8ac2302fa00985a57e4e58124ab",
+  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;6bf74e9b02f310ddcab9c460b7e0983c",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {