diff --git a/app/src/main/java/com/github/catvod/bean/alist/Item.java b/app/src/main/java/com/github/catvod/bean/alist/Item.java index bf8f9eb..e62e0c9 100644 --- a/app/src/main/java/com/github/catvod/bean/alist/Item.java +++ b/app/src/main/java/com/github/catvod/bean/alist/Item.java @@ -111,6 +111,10 @@ public class Item { } public String getVodId(String id) { + return id + "/" + getName(); + } + + public String getVodPath(String id) { return id + getPath() + "/" + getName(); } @@ -127,6 +131,6 @@ public class Item { } public Vod getVod(Drive drive) { - return new Vod(getVodId(drive.getName()), getName(), getPic(), drive.getName(), isFolder()); + return new Vod(getVodPath(drive.getName()), getName(), getPic(), drive.getName(), isFolder()); } } 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 9cf7652..7fc2341 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -18,9 +18,6 @@ import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Util; import org.json.JSONObject; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; import java.util.ArrayList; import java.util.Arrays; @@ -270,29 +267,6 @@ public class AList extends Spider { @Override public List call() { - List alist = alist(); - return !alist.isEmpty() ? alist : xiaoya(); - } - - private List xiaoya() { - List list = new ArrayList<>(); - Document doc = Jsoup.parse(OkHttp.string(drive.searchApi(keyword))); - for (Element a : doc.select("ul > a")) { - String[] splits = a.text().split("#"); - if (!splits[0].contains("/")) continue; - int index = splits[0].lastIndexOf("/"); - boolean file = Util.isMedia(splits[0]); - Item item = new Item(); - item.setType(file ? 0 : 1); - item.setThumb(splits.length > 3 ? splits[4] : ""); - item.setPath("/" + splits[0].substring(0, index)); - item.setName(splits[0].substring(index + 1)); - list.add(item.getVod(drive)); - } - return list; - } - - private List alist() { try { List list = new ArrayList<>(); String response = post(drive, drive.searchApi(), drive.params(keyword)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 33e4343..f2aabd5 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 69c1aac..d34999e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -9126aa90a41b25415d66a7fa572c92bc +b9bdfaa2a27f0f64a0053f7f3d193c29