From 26efcd99d1d90cad5dc5a83090762c0dd21b6bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E4=B8=89?=
 <89683694+Tangsan99999@users.noreply.github.com>
Date: Thu, 17 Nov 2022 19:17:51 +0800
Subject: [PATCH] Update Ali(size) Fix Alist loop page

---
 .../java/com/github/catvod/bean/Result.java   | 32 +++++++++++++++++++
 .../java/com/github/catvod/bean/ali/Item.java |  9 ++++--
 .../java/com/github/catvod/spider/AList.java  |  2 +-
 .../java/com/github/catvod/spider/Ali.java    |  2 +-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java
index e7f18281..759fefbc 100644
--- a/app/src/main/java/com/github/catvod/bean/Result.java
+++ b/app/src/main/java/com/github/catvod/bean/Result.java
@@ -32,6 +32,14 @@ public class Result {
     private int parse;
     @SerializedName("jx")
     private int jx;
+    @SerializedName("page")
+    private int Page;
+    @SerializedName("pagecount")
+    private int PageCount;
+    @SerializedName("limit")
+    private int Limit;
+    @SerializedName("total")
+    private int Total;
 
     public static String string(List<Class> classes, List<Vod> list, LinkedHashMap<String, List<Filter>> filters) {
         return Result.get().classes(classes).vod(list).filters(filters).string();
@@ -137,4 +145,28 @@ public class Result {
     public String toString() {
         return new Gson().toJson(this);
     }
+
+    public Result pageSetup(int Page, int PageCount, int Limit, int Total) {
+        if (Page > 0) {
+            this.Page = Page;
+        } else {
+            this.Page = Integer.MAX_VALUE;
+        }
+        if (PageCount > 0) {
+            this.PageCount = PageCount;
+        } else {
+            this.PageCount = Integer.MAX_VALUE;
+        }
+        if (Limit > 0) {
+            this.Limit = Limit;
+        } else {
+            this.Limit = Integer.MAX_VALUE;
+        }
+        if (Total > 0) {
+            this.Total = Total;
+        } else {
+            this.Total = Integer.MAX_VALUE;
+        }
+        return this;
+    }
 }
diff --git a/app/src/main/java/com/github/catvod/bean/ali/Item.java b/app/src/main/java/com/github/catvod/bean/ali/Item.java
index 25aa7fe8..d45eb6e1 100644
--- a/app/src/main/java/com/github/catvod/bean/ali/Item.java
+++ b/app/src/main/java/com/github/catvod/bean/ali/Item.java
@@ -2,6 +2,7 @@ package com.github.catvod.bean.ali;
 
 import android.text.TextUtils;
 
+import com.github.catvod.utils.Misc;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
@@ -26,6 +27,8 @@ public class Item {
     private String fileExtension;
     @SerializedName("category")
     private String category;
+    @SerializedName("size")
+    private double size;
 
     public static Item objectFrom(String str) {
         return new Gson().fromJson(str, Item.class);
@@ -67,11 +70,11 @@ public class Item {
         return TextUtils.isEmpty(category) ? "" : category;
     }
 
-    public String getDisplayName(String fileName) {
-        return getName().isEmpty() ? fileName : "[" + getName() + "] " + fileName;
-    }
+    public String getDisplayName(String fileName, String size) { return getSize().isEmpty() ? "[" + size + "]" + fileName : fileName; }
 
     public String removeExt() {
         return getName().indexOf(".") > 0 ? getName().substring(0, getName().lastIndexOf(".")) : getName();
     }
+
+    public String getSize() { return TextUtils.isEmpty(Misc.getSize(size)) ? "" : Misc.getSize(size); }
 }
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 f3980e94..2afbd4a4 100644
--- a/app/src/main/java/com/github/catvod/spider/AList.java
+++ b/app/src/main/java/com/github/catvod/spider/AList.java
@@ -116,7 +116,7 @@ public class AList extends Spider {
         Sorter.sort(type, order, files);
         for (Item item : folders) list.add(item.getVod(tid));
         for (Item item : files) list.add(item.getVod(tid));
-        return Result.string(list);
+        return Result.get().vod(list).pageSetup(1, 1, 0, 1).string();
     }
 
     @Override
diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java
index 786ab8a3..554413b6 100644
--- a/app/src/main/java/com/github/catvod/spider/Ali.java
+++ b/app/src/main/java/com/github/catvod/spider/Ali.java
@@ -144,7 +144,7 @@ public class Ali {
             if (file.getType().equals("folder")) {
                 folders.add(file);
             } else if (file.getCategory().equals("video") || file.getCategory().equals("audio")) {
-                name2id.put(parent.getDisplayName(file.getName()), shareId + "+" + shareToken + "+" + file.getFileId());
+                name2id.put(parent.getDisplayName(file.getName(), file.getSize()), shareId + "+" + shareToken + "+" + file.getFileId());
             } else if (Misc.isSub(file.getExt())) {
                 String key = file.removeExt();
                 if (!subMap.containsKey(key)) subMap.put(key, new ArrayList<>());