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 5f41486f..360c28e9 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -23,9 +23,8 @@ public class Push extends Spider { String url = ids.get(0).trim(); if (url.contains("aliyundrive")) return ali.detailContent(ids); if (Misc.isVip(url)) return Result.string(vod(url, "官源")); - if (url.startsWith("magnet")) return Result.string(vod(url, "磁力")); - if (url.startsWith("http") && url.endsWith("html")) return Result.string(vod(url, "網頁")); - return Result.string(vod(url, "直連")); + if (Misc.isVideoFormat(url)) return Result.string(vod(url, "直連")); + return Result.string(vod(url, "網頁")); } @Override diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index c49ae7a0..fa60d0d7 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -31,7 +31,6 @@ public class Misc { } public static boolean isVideoFormat(String url) { - if (url.contains(".js") || url.contains(".css")) return false; return Sniffer.RULE.matcher(url).find(); } diff --git a/app/src/main/java/com/github/catvod/utils/Sniffer.java b/app/src/main/java/com/github/catvod/utils/Sniffer.java index cc19382f..c934b3c3 100644 --- a/app/src/main/java/com/github/catvod/utils/Sniffer.java +++ b/app/src/main/java/com/github/catvod/utils/Sniffer.java @@ -6,8 +6,6 @@ public class Sniffer { public static final Pattern RULE = Pattern.compile( "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a)\\?.*|" + - "http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a)|" + - "http((?!http).)*?xg.php\\?id=|" + - "http((?!http).)*?video/tos*" + "http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a)" ); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index f6e4830f..163356b2 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 5d36b110..d37d5bf2 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -262cbd619eec331739fb0f120533390e +9f41e0f17e45a009989248435542b4bc