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 af0eb413..21429987 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -87,9 +87,11 @@ public class AList extends Spider { fetchRule(); String type = extend.containsKey("type") ? extend.get("type") : ""; String order = extend.containsKey("order") ? extend.get("order") : ""; + String key = tid.contains("/") ? tid.substring(0, tid.indexOf("/")) : tid; List folders = new ArrayList<>(); List files = new ArrayList<>(); List list = new ArrayList<>(); + for (Item item : getList(tid, true)) { if (item.isFolder()) folders.add(item); else files.add(item); @@ -98,9 +100,12 @@ public class AList extends Spider { Sorter.sort(type, order, folders); Sorter.sort(type, order, files); } - if (files.size() > 1) { - folders.add(0, Item.playList(files.get(0), vodPic)); - } + + int count = 0; + Drive drive = getDrive(key); + 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)); for (Item item : files) list.add(item.getVod(tid, vodPic)); return Result.get().vod(list).page().string(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index a2369241..ee3d666e 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 0be4d426..08a6b476 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -7871d4d3a51b5b0aa46b079b8104c2be +17875e4db6cc760f260451ad7651e887 diff --git a/json/adult.json b/json/adult.json index e21e375d..195713a7 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7871d4d3a51b5b0aa46b079b8104c2be", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;17875e4db6cc760f260451ad7651e887", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 3c39361d..7202726f 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7871d4d3a51b5b0aa46b079b8104c2be", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;17875e4db6cc760f260451ad7651e887", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ { @@ -234,15 +234,6 @@ "api": "csp_Push", "searchable": 1, "changeable": 0 - }, - { - "key": "公告", - "name": "公告", - "type": 3, - "api": "csp_Notice", - "searchable": 0, - "changeable": 0, - "ext": "ewogICJtc2ciOiAi6ICB5amGfue1kOWpmuS4gOmAseW5tOW/q+aogiIsCiAgImRhdGUiOiAiMjAyMzA2MDcyMDAwMDAiLAogICJkdXJhdGlvbiI6IDMwCn0=" } ], "doh": [