diff --git a/app/src/main/java/com/github/catvod/spider/Push.java b/app/src/main/java/com/github/catvod/spider/Push.java index a02f0243..afb33db4 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -59,21 +59,20 @@ public class Push extends Ali { private void setHttpSub(String url, List subs) { try { - String ext = Utils.getExt(url); - if (!ext.equals("mp4") && !ext.equals("mkv")) return; - List types = Arrays.asList(".srt", ".ass"); - for (String type : types) detectSub(Utils.removeExt(url).concat(type), subs); + List vodTypes = Arrays.asList("mp4", "mkv"); + List subTypes = Arrays.asList("srt", "ass"); + if (!vodTypes.contains(Utils.getExt(url))) return; + for (String ext : subTypes) detectSub(url, ext, subs); } catch (Exception e) { e.printStackTrace(); } } - private void detectSub(String url, List subs) throws Exception { - if (OkHttp.newCall(url).code() == 200) { - String ext = Utils.getExt(url); - String name = Uri.parse(url).getLastPathSegment(); - subs.add(Sub.create().name(name).ext(ext).url(url)); - } + private void detectSub(String url, String ext, List subs) throws Exception { + url = Utils.removeExt(url).concat(".").concat(ext); + if (OkHttp.newCall(url).code() != 200) return; + String name = Uri.parse(url).getLastPathSegment(); + subs.add(Sub.create().name(name).ext(ext).url(url)); } private void setFileSub(String url, List subs) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 78c9ee43..1d91816e 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index cc03c108..65e39351 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d0ac4c362ded4782f74f467bfa3420be +d02ea3eb2cda4c0a98f3758125eb667e diff --git a/json/adult.json b/json/adult.json index 9dd5af80..9513cf7e 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;d0ac4c362ded4782f74f467bfa3420be", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;d02ea3eb2cda4c0a98f3758125eb667e", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 72e49bbc..56d5d7e6 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;d0ac4c362ded4782f74f467bfa3420be", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;d02ea3eb2cda4c0a98f3758125eb667e", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {