diff --git a/app/src/main/java/com/github/catvod/spider/AList.java b/app/src/main/java/com/github/catvod/spider/AList.java index 402349fa..a497cf66 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -136,8 +136,8 @@ public class AList extends Spider { String path = id.contains("/") ? id.substring(id.indexOf("/")) : ""; Drive drive = getDrive(key); JSONObject params = new JSONObject(); - params.put("path", drive.getPath() + path); params.put("password", drive.getPassword()); + params.put("path", path.startsWith(drive.getPath()) ? path : drive.getPath() + path); String response = OkHttp.postJson(drive.getApi(), params.toString()); return Item.objectFrom(getDetailJson(drive.isNew(), response)); } catch (Exception e) { @@ -151,8 +151,8 @@ public class AList extends Spider { String path = id.contains("/") ? id.substring(id.indexOf("/")) : ""; Drive drive = getDrive(key); JSONObject params = new JSONObject(); - params.put("path", drive.getPath() + path); params.put("password", drive.getPassword()); + params.put("path", path.startsWith(drive.getPath()) ? path : drive.getPath() + path); String response = OkHttp.postJson(drive.listApi(), params.toString()); List items = Item.arrayFrom(getListJson(drive.isNew(), response)); Iterator iterator = items.iterator(); 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 6af02d8e..2cf57f8e 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; +import java.io.File; import java.util.Arrays; import java.util.List; @@ -34,8 +35,8 @@ public class Push extends Ali { private Vod vod(String url) { Vod vod = new Vod(); vod.setVodId(url); - vod.setVodName(url); vod.setTypeName("FongMi"); + vod.setVodName(url.startsWith("file://") ? new File(url).getName() : url); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url))); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 8e096f68..5e1d3120 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 33473c9e..edfd9561 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -3473c6feb44308efdb18ef8ea90ed6eb +3b702732dd7f792513d3f3cf006f8898 diff --git a/json/adult.json b/json/adult.json index 7dc16630..cecf3dd0 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3473c6feb44308efdb18ef8ea90ed6eb", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3b702732dd7f792513d3f3cf006f8898", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index b40c06e5..a42285c2 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3473c6feb44308efdb18ef8ea90ed6eb", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3b702732dd7f792513d3f3cf006f8898", "wallpaper": "http://饭太硬.ga/深色壁纸/api.php", "sites": [ {