diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 59246298..611cde69 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; */ public class Ali extends Spider { - public static final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?"); + public static final Pattern pattern = Pattern.compile("(www.aliyundrive.com|www.alipan.com)/s/([^/]+)(/folder/([^/]+))?"); @Override public void init(Context context, String extend) { @@ -41,8 +41,8 @@ public class Ali extends Spider { } private Vod parseVod(Matcher matcher, String id) { - String shareId = matcher.group(1); - String fileId = matcher.groupCount() == 3 ? matcher.group(3) : ""; + String shareId = matcher.group(2); + String fileId = matcher.groupCount() == 4 ? matcher.group(4) : ""; return AliYun.get().getVod(id, shareId, fileId); } @@ -84,4 +84,4 @@ public class Ali extends Spider { if ("token".equals(type)) return AliYun.get().getToken(); return null; } -} \ No newline at end of file +} diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6ca021ce..b95fdece 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 008c0926..02207b2b 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -1117603a248d03a2fba94c991612970f +f4fa24d313b7290001db8ef49bd8ae0b diff --git a/json/adult.json b/json/adult.json index 4fb1336f..0d132a4c 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;1117603a248d03a2fba94c991612970f", + "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;f4fa24d313b7290001db8ef49bd8ae0b", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index ec44e841..2308970e 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;1117603a248d03a2fba94c991612970f", + "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;f4fa24d313b7290001db8ef49bd8ae0b", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {