From 7d4713fe3985a96d12886ca2c637275821fd10c7 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 11 Jul 2023 12:46:09 +0800 Subject: [PATCH 1/3] Use cdn --- json/adult.json | 2 +- json/config.json | 8 ++++---- tools/src/main/java/com/fongmi/tools/Live.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/json/adult.json b/json/adult.json index 25bba444..88350f1f 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;bdaba6bfae7ce2c142343af8e9731c4d", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bdaba6bfae7ce2c142343af8e9731c4d", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 9660627a..cb56c9a4 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;bdaba6bfae7ce2c142343af8e9731c4d", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bdaba6bfae7ce2c142343af8e9731c4d", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ { @@ -17,7 +17,7 @@ "api": "csp_AList", "searchable": 1, "changeable": 0, - "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json" + "ext": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/json/alist.json" }, { "key": "WebDAV", @@ -26,7 +26,7 @@ "api": "csp_WebDAV", "searchable": 1, "changeable": 0, - "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/webdav.json" + "ext": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/json/webdav.json" }, { "key": "哔哩", @@ -63,7 +63,7 @@ "api": "csp_XPathMacFilter", "searchable": 1, "changeable": 1, - "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/duboku.json" + "ext": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/json/duboku.json" }, { "key": "傢伙", diff --git a/tools/src/main/java/com/fongmi/tools/Live.java b/tools/src/main/java/com/fongmi/tools/Live.java index ffa9d0e5..72d4eaf0 100644 --- a/tools/src/main/java/com/fongmi/tools/Live.java +++ b/tools/src/main/java/com/fongmi/tools/Live.java @@ -51,7 +51,7 @@ public class Live { for (Group group : groups) { for (Channel channel : group.getChannel()) { channel.number(String.format(Locale.getDefault(), "%03d", ++number)); - channel.logo("https://ghproxy.com/https://raw.githubusercontent.com/FongMi/TV/release/app/src/main/res/drawable-xxhdpi/ic_img_empty.png"); + channel.logo("https://fongmi.cachefly.net/FongMi/TV/release/app/src/main/res/drawable-xxhdpi/ic_img_empty.png"); combine(channel); } } From a1b7dee1972e27d14b7daf7239b7b0669f08c8a0 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 11 Jul 2023 17:03:30 +0800 Subject: [PATCH 2/3] Update config.json --- json/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/json/config.json b/json/config.json index cb56c9a4..992a48c1 100644 --- a/json/config.json +++ b/json/config.json @@ -289,8 +289,7 @@ "aws.ulivetv.net" ], "regex": [ - "#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:8,[\\s\\S]*?#EXT-X-DISCONTINUITY", - "#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:9,[\\s\\S]*?#EXT-X-DISCONTINUITY" + "#EXT-X-DISCONTINUITY\\r*\\n*#EXTINF:8,[\\s\\S]*?#EXT-X-DISCONTINUITY" ] }, { From 5275ae085c4676d496c26725a0d86826488cca23 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 11 Jul 2023 18:06:01 +0800 Subject: [PATCH 3/3] Don't need youtube --- .../java/com/github/catvod/spider/Push.java | 1 - .../com/github/catvod/spider/Youtube.java | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 app/src/main/java/com/github/catvod/spider/Youtube.java 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 fc24b72a..ffdf5e3e 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -32,7 +32,6 @@ public class Push extends Ali { @Override public String playerContent(String flag, String id, List vipFlags) { - if (id.contains("youtube.com")) return Result.get().url(Youtube.fetch(id)).string(); if (flag.equals("直連")) return Result.get().url(id).subs(getSubs(id)).string(); if (flag.equals("嗅探")) return Result.get().parse().url(id).string(); if (flag.equals("解析")) return Result.get().parse().jx().url(id).string(); diff --git a/app/src/main/java/com/github/catvod/spider/Youtube.java b/app/src/main/java/com/github/catvod/spider/Youtube.java deleted file mode 100644 index c6548ab3..00000000 --- a/app/src/main/java/com/github/catvod/spider/Youtube.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.catvod.spider; - -import com.github.catvod.net.OkHttp; -import com.github.catvod.utils.Utils; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class Youtube { - - private static HashMap getHeader() { - HashMap headers = new HashMap<>(); - headers.put("User-Agent", Utils.CHROME); - return headers; - } - - public static String fetch(String url) { - try { - String result = OkHttp.string(url, getHeader()); - Pattern pattern = Pattern.compile("hlsManifestUrl\\S*?(https\\S*?\\.m3u8)"); - Matcher matcher = pattern.matcher(result); - if (!matcher.find()) return ""; - String stable = matcher.group(1); - result = OkHttp.string(stable, getHeader()); - String quality = find(result); - return quality.isEmpty() ? url : quality; - } catch (Exception e) { - e.printStackTrace(); - return url; - } - } - - private static String find(String result) { - String url = ""; - List items = Arrays.asList("301", "300", "96", "95", "94"); - for (String item : items) if (!(url = find(result, "https:/.*/" + item + "/.*index.m3u8")).isEmpty()) break; - return url; - } - - private static String find(String result, String rule) { - Pattern pattern = Pattern.compile(rule); - Matcher matcher = pattern.matcher(result); - if (matcher.find()) return matcher.group(); - return ""; - } -}