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

app/src/main/java/com/github/catvod/bean/ali/Sorter.java

@@ -15,9 +15,13 @@ public class Sorter implements Comparator<Item> {
     @Override
     public int compare(Item o1, Item o2) {
         try {
-            return Integer.valueOf(Utils.removeExt(o1.getDisplayName())).compareTo(Integer.valueOf(Utils.removeExt(o2.getDisplayName())));
+            return Integer.compare(getDigit(o1.getDisplayName()), getDigit(o2.getDisplayName()));
         } catch (NumberFormatException e) {
             return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
         }
     }
+
+    private int getDigit(String text) throws NumberFormatException {
+        return Integer.parseInt(Utils.removeExt(text).replaceAll("\\D+", ""));
+    }
 }

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

@@ -69,7 +69,7 @@ public class Zhaozy extends Ali {
 
     @Override
     public String searchContent(String key, boolean quick) throws Exception {
-        String url = siteUrl + "so?filename=" + URLEncoder.encode(key);
+        String url = siteUrl + "sos?filename=" + URLEncoder.encode(key);
         Document doc = Jsoup.parse(OkHttp.string(url, getHeader()));
         List<Vod> list = new ArrayList<>();
         for (Element element : doc.select("div.li_con div.news_text")) {

app/src/main/java/com/github/catvod/utils/Utils.java

@@ -10,7 +10,6 @@ import android.webkit.ValueCallback;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.github.catvod.crawler.SpiderDebug;
 import com.github.catvod.spider.Init;
 
 import java.math.BigInteger;
@@ -56,19 +55,16 @@ public class Utils {
     }
 
     public static String fixUrl(String base, String src) {
-        try {
         if (src.startsWith("//")) {
             Uri parse = Uri.parse(base);
-                src = parse.getScheme() + ":" + src;
+            return parse.getScheme() + ":" + src;
         } else if (!src.contains("://")) {
             Uri parse = Uri.parse(base);
-                src = parse.getScheme() + "://" + parse.getHost() + src;
-            }
-        } catch (Exception e) {
-            SpiderDebug.log(e);
-        }
+            return parse.getScheme() + "://" + parse.getHost() + src;
+        } else {
             return src;
         }
+    }
 
     public static String removeExt(String text) {
         return text.contains(".") ? text.substring(0, text.lastIndexOf(".")) : text;

jar/custom_spider.jar.md5

@@ -1 +1 @@
-06c33541084d5842fdbf6e67ce4258ed
+1da9b9d6b4241ada175c741d4b4b9cf9

json/adult.json

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

json/ali.json

@@ -52,7 +52,7 @@
       "searchable": 1,
       "filterable": 0,
       "changeable": 0,
-      "ext": "影視天下第一$$$yingshi$$$abcd1234",
+      "ext": "影視天下第一$$$test2$$$test2",
       "jar": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
     },
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;06c33541084d5842fdbf6e67ce4258ed",
+  "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1da9b9d6b4241ada175c741d4b4b9cf9",
   "wallpaper": "http://饭太硬.ga/深色壁纸/api.php",
   "sites": [
     {
@@ -131,7 +131,7 @@
       "searchable": 1,
       "filterable": 0,
       "changeable": 0,
-      "ext": "影視天下第一$$$yingshi$$$abcd1234"
+      "ext": "影視天下第一$$$test2$$$test2"
     },
     {
       "key": "push_agent",