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 c051ff7..89e8efa 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -102,16 +102,36 @@ public class AList extends Spider { List parents = getList(path, false); Sorter.sort("name", "asc", parents); List playUrls = new ArrayList<>(); - for (Item item : parents) if (item.isVideo(drive.isNew())) playUrls.add(Trans.get(item.getName()) + "$" + item.getUrl() + findSubs(path, parents)); + for (Item item : parents) { + if (item.isVideo(drive.isNew())) { + playUrls.add(Trans.get(item.getName()) + "$" + item.getVodId(path) + findSubs(path, parents)); + } + } Vod vod = new Vod(); vod.setVodId(id); vod.setVodName(name); - vod.setVodPlayFrom("AList"); + vod.setVodPlayFrom(key); vod.setVodPlayUrl(TextUtils.join("#", playUrls)); vod.setVodPic("http://img1.3png.com/281e284a670865a71d91515866552b5f172b.png"); return Result.string(vod); } + @Override + public String searchContent(String keyword, boolean quick) throws Exception { + fetchRule(); + List list = new ArrayList<>(); + CountDownLatch cd = new CountDownLatch(drives.size()); + for (Drive drive : drives) new Thread(() -> search(cd, list, drive, keyword)).start(); + cd.await(); + return Result.string(list); + } + + @Override + public String playerContent(String flag, String id, List vipFlags) { + String[] ids = id.split("~~~"); + return Result.get().url(getDetail(ids[0]).getUrl()).sub(getSub(ids)).string(); + } + private Item getDetail(String id) { try { String key = id.contains("/") ? id.substring(0, id.indexOf("/")) : id; @@ -147,22 +167,6 @@ public class AList extends Spider { } } - @Override - public String searchContent(String keyword, boolean quick) throws Exception { - fetchRule(); - List list = new ArrayList<>(); - CountDownLatch cd = new CountDownLatch(drives.size()); - for (Drive drive : drives) new Thread(() -> search(cd, list, drive, keyword)).start(); - cd.await(); - return Result.string(list); - } - - @Override - public String playerContent(String flag, String id, List vipFlags) { - String[] ids = id.split("~~~"); - return Result.get().url(ids[0]).sub(getSub(ids)).string(); - } - private String getParams(String keyword) { try { JSONObject params = new JSONObject(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 79fa2ea..2f25ebd 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 6f7380a..c538f9a 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d54084d0ba8d794dd2768ad3492fd208 +aa1aaf2c71abcb2b2da5db8301c1e3da