Update alist

This commit is contained in:
FongMi 2023-01-08 20:05:13 +08:00
parent f0e87e1888
commit 0cfea717fd
5 changed files with 11 additions and 9 deletions

View File

@ -34,8 +34,8 @@ public class AList extends Spider {
private List<Filter> getFilter() { private List<Filter> getFilter() {
List<Filter> items = new ArrayList<>(); List<Filter> items = new ArrayList<>();
items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date")))); items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date"))));
items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("", "asc"), new Filter.Value("", "desc")))); items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("", "asc"), new Filter.Value("", "desc"))));
return items; return items;
} }
@ -71,8 +71,8 @@ public class AList extends Spider {
@Override @Override
public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception { public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
fetchRule(); fetchRule();
String type = extend.containsKey("type") ? extend.get("type") : "name"; String type = extend.containsKey("type") ? extend.get("type") : "";
String order = extend.containsKey("order") ? extend.get("order") : "asc"; String order = extend.containsKey("order") ? extend.get("order") : "";
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<>();
@ -80,8 +80,10 @@ public class AList extends Spider {
if (item.isFolder()) folders.add(item); if (item.isFolder()) folders.add(item);
else files.add(item); else files.add(item);
} }
Sorter.sort(type, order, folders); if (!TextUtils.isEmpty(type) && !TextUtils.isEmpty(order)) {
Sorter.sort(type, order, files); Sorter.sort(type, order, folders);
Sorter.sort(type, order, files);
}
for (Item item : folders) list.add(item.getVod(tid)); for (Item item : folders) list.add(item.getVod(tid));
for (Item item : files) list.add(item.getVod(tid)); for (Item item : files) list.add(item.getVod(tid));
return Result.get().vod(list).page().string(); return Result.get().vod(list).page().string();

Binary file not shown.

View File

@ -1 +1 @@
7ea557373acdfaecb8095ad3b1bf5529 279424aa7be0e38dbd884daf8913c1d4

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7ea557373acdfaecb8095ad3b1bf5529", "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4",
"wallpaper": "https://gao.chuqiuyu.tk", "wallpaper": "https://gao.chuqiuyu.tk",
"lives": [ "lives": [
{ {

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7ea557373acdfaecb8095ad3b1bf5529", "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4",
"wallpaper": "http://www.kf666888.cn/api/tvbox/img", "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
"lives": [ "lives": [
{ {