|
|
|
|
@ -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<Item> folders = new ArrayList<>(); |
|
|
|
|
List<Item> files = new ArrayList<>(); |
|
|
|
|
List<Vod> 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(); |
|
|
|
|
|