dongge
/
CatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/FongMi/CatVodSpider

This commit is contained in:
GH Action - Upstream Sync 2023-06-08 01:43:58 +00:00
parent a7d42b851d 09c8793c68
commit 03ad94953d
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/github/catvod/spider/AList.java
View File

@ -87,9 +87,11 @@ public class AList extends Spider {
fetchRule(); fetchRule();
String type = extend.containsKey("type") ? extend.get("type") : ""; String type = extend.containsKey("type") ? extend.get("type") : "";
String order = extend.containsKey("order") ? extend.get("order") : ""; String order = extend.containsKey("order") ? extend.get("order") : "";
String key = tid.contains("/") ? tid.substring(0, tid.indexOf("/")) : tid;
List<Item> folders = new ArrayList<>(); List<Item> folders = new ArrayList<>();
List<Item> files = new ArrayList<>(); List<Item> files = new ArrayList<>();
List<Vod> list = new ArrayList<>(); List<Vod> list = new ArrayList<>();
for (Item item : getList(tid, true)) { for (Item item : getList(tid, true)) {
if (item.isFolder()) folders.add(item); if (item.isFolder()) folders.add(item);
else files.add(item); else files.add(item);
@ -98,9 +100,12 @@ public class AList extends Spider {
Sorter.sort(type, order, folders); Sorter.sort(type, order, folders);
Sorter.sort(type, order, files); 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 : folders) list.add(item.getVod(tid, vodPic));
for (Item item : files) list.add(item.getVod(tid, vodPic)); for (Item item : files) list.add(item.getVod(tid, vodPic));
return Result.get().vod(list).page().string(); return Result.get().vod(list).page().string();

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
7871d4d3a51b5b0aa46b079b8104c2be 17875e4db6cc760f260451ad7651e887

2
json/adult.json
View File

@ -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", "wallpaper": "https://gao.chuqiuyu.tk",
"sites": [ "sites": [
{ {

11
json/config.json
View File

@ -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", "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
"sites": [ "sites": [
{ {
@ -234,15 +234,6 @@
"api": "csp_Push", "api": "csp_Push",
"searchable": 1, "searchable": 1,
"changeable": 0 "changeable": 0
},
{
"key": "公告",
"name": "公告",
"type": 3,
"api": "csp_Notice",
"searchable": 0,
"changeable": 0,
"ext": "ewogICJtc2ciOiAi6ICB5amGfue1kOWpmuS4gOmAseW5tOW/q+aogiIsCiAgImRhdGUiOiAiMjAyMzA2MDcyMDAwMDAiLAogICJkdXJhdGlvbiI6IDMwCn0="
} }
], ],
"doh": [ "doh": [