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 21429987..c21f4dc3 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -103,7 +103,7 @@ public class AList extends Spider { int count = 0; Drive drive = getDrive(key); - for (Item item:files) if (item.isMedia(drive.isNew())) count++; + for (Item item : files) if (item.isMedia(drive.isNew())) count++; if (count > 1) folders.add(0, Item.playList(files.get(0), vodPic)); for (Item item : folders) list.add(item.getVod(tid, vodPic)); @@ -120,23 +120,26 @@ public class AList extends Spider { String path = id.substring(0, id.lastIndexOf("/")); String name = path.substring(path.lastIndexOf("/") + 1); Drive drive = getDrive(key); - List playUrls = new ArrayList<>(); List parents = getList(path, false); Sorter.sort("name", "asc", parents); + Vod vod = new Vod(); + vod.setVodPlayFrom(key); if (list) { + vod.setVodId(id); + vod.setVodName(name); + vod.setVodPic(vodPic); + List playUrls = new ArrayList<>(); for (Item item : parents) if (item.isMedia(drive.isNew())) playUrls.add(item.getName() + "$" + item.getVodId(path) + findSubs(path, parents)); + vod.setVodPlayUrl(TextUtils.join("#", playUrls)); } else { Item item = getDetail(id); - playUrls.add(item.getName() + "$" + item.getVodId(path) + findSubs(path, parents)); + vod.setVodId(item.getVodId(id)); + vod.setVodName(item.getName()); + vod.setVodPic(item.getPic(vodPic)); + vod.setVodPlayUrl(item.getName() + "$" + item.getVodId(path) + findSubs(path, parents)); } - Vod vod = new Vod(); - vod.setVodId(id); - vod.setVodName(name); - vod.setVodPic(vodPic); - vod.setVodPlayFrom(key); - vod.setVodPlayUrl(TextUtils.join("#", playUrls)); return Result.string(vod); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index ee3d666e..df46cf6a 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 08a6b476..c54d06e2 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -17875e4db6cc760f260451ad7651e887 +91c9b5707a41ef60147a684a61089966