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 a056118d..c0b9387f 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -53,10 +53,16 @@ public class Push extends Spider { vod.setTypeName("FongMi"); vod.setVodName(url.startsWith("file://") ? new File(url).getName() : url); if (url.startsWith("http") && url.contains("#")) url = url.replace("#", "***"); - String play = "播放$" + url; - boolean thunder = Util.isThunder(url); - vod.setVodPlayUrl(thunder ? play : TextUtils.join("$$$", Arrays.asList(play, play, play))); - vod.setVodPlayFrom(thunder ? "迅雷" : TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); + if (Util.isThunder(url)) { + vod.setVodPlayUrl(url); + vod.setVodPlayFrom("迅雷"); + } else if (url.contains("$")) { + vod.setVodPlayFrom("直連"); + vod.setVodPlayUrl(TextUtils.join("#", url.split("\n"))); + } else { + vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList(url, url, url))); + vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); + } return vod; } diff --git a/app/src/main/java/com/github/catvod/spider/Xb6v.java b/app/src/main/java/com/github/catvod/spider/Xb6v.java index f57c82ca..778e6f05 100644 --- a/app/src/main/java/com/github/catvod/spider/Xb6v.java +++ b/app/src/main/java/com/github/catvod/spider/Xb6v.java @@ -34,7 +34,7 @@ import okhttp3.Response; */ public class Xb6v extends Spider { - private final String siteUrl = "http://www.xb6v.com"; + private final String siteUrl = "https://www.xb6v.com"; private String nextSearchUrlPrefix; private String nextSearchUrlSuffix; diff --git a/app/src/main/java/com/github/catvod/utils/Util.java b/app/src/main/java/com/github/catvod/utils/Util.java index d6b74f18..8dc3a564 100644 --- a/app/src/main/java/com/github/catvod/utils/Util.java +++ b/app/src/main/java/com/github/catvod/utils/Util.java @@ -29,7 +29,7 @@ public class Util { public static final Pattern THUNDER = Pattern.compile("(magnet|thunder|ed2k):.*"); public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"; public static final String ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"; - public static final List MEDIA = Arrays.asList("mp4", "mkv", "wmv", "flv", "avi", "iso", "mpg", "ts", "mp3", "aac", "flac", "m4a", "ape", "ogg"); + public static final List MEDIA = Arrays.asList("mp4", "mkv", "wmv", "flv", "avi", "iso", "mpg", "ts", "iso", "mp3", "aac", "flac", "m4a", "ape", "ogg"); public static final List SUB = Arrays.asList("srt", "ass", "ssa", "vtt"); public static boolean isVip(String url) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 467d4624..043274b7 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 39809f20..d0584ae8 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -2db0ca4bba291bb9357998923bea5c34 +3eb80d3f9fc40b9470b262c4c66b39f6