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 2abdd54b..d7437f83 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 @@ -6,6 +6,7 @@ import com.github.catvod.utils.Misc; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -29,6 +30,8 @@ public class Item { private String category; @SerializedName("size") private double size; + @SerializedName("parent") + private String parent; public static Item objectFrom(String str) { return new Gson().fromJson(str, Item.class); @@ -50,10 +53,6 @@ public class Item { return TextUtils.isEmpty(fileId) ? "" : fileId; } - public String getShareId() { - return TextUtils.isEmpty(shareId) ? "" : shareId; - } - public String getName() { return TextUtils.isEmpty(name) ? "" : name; } @@ -70,12 +69,21 @@ public class Item { return TextUtils.isEmpty(category) ? "" : category; } - public double getSize() { - return size; + public String getSize() { + return size == 0 ? "" : "[" + Misc.getSize(size) + "]"; + } + + public String getParent() { + return TextUtils.isEmpty(parent) ? "" : "[" + parent + "]"; + } + + public Item parent(String parent) { + this.parent = parent; + return this; } public String getDisplayName() { - return getSize() == 0 ? getName() : "[" + Misc.getSize(getSize()) + "] " + getName(); + return TextUtils.join(" ", Arrays.asList(getParent(), getName(), getSize())).trim(); } public String removeExt() { 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 5bcbf41d..92e2009c 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -155,7 +155,7 @@ public class Ali { if (file.getType().equals("folder")) { folders.add(file); } else if (file.getCategory().equals("video") || file.getCategory().equals("audio")) { - files.add(file); + files.add(file.parent(parent.getName())); } else if (Misc.isSub(file.getExt())) { String key = file.removeExt(); if (!subMap.containsKey(key)) subMap.put(key, new ArrayList<>()); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 5261ebf7..1b9277bd 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 aae3ce6b..782d7e52 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -b6cec380ddab899d275cf2fec2ed676a +bad875495a9d88aeb0dc1744e9c85feb diff --git a/json/adult.json b/json/adult.json index 9e1fde28..0ec87365 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b6cec380ddab899d275cf2fec2ed676a", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bad875495a9d88aeb0dc1744e9c85feb", "wallpaper": "https://gao.chuqiuyu.tk", "lives": [ { @@ -618,7 +618,7 @@ "api": "csp_Push", "searchable": 1, "filterable": 1, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" } ] } \ No newline at end of file diff --git a/json/config.json b/json/config.json index ab78b50a..3f34c32a 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b6cec380ddab899d275cf2fec2ed676a", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bad875495a9d88aeb0dc1744e9c85feb", "wallpaper": "http://www.kf666888.cn/api/tvbox/img", "lives": [ { @@ -123,7 +123,7 @@ "api": "csp_Paper", "searchable": 1, "filterable": 1, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" }, { "key": "易搜", @@ -132,7 +132,7 @@ "api": "csp_YiSo", "searchable": 1, "filterable": 0, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" }, { "key": "盤搜", @@ -141,7 +141,7 @@ "api": "csp_PanSou", "searchable": 1, "filterable": 0, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" }, { "key": "UP雲搜", @@ -150,7 +150,7 @@ "api": "csp_UpYun", "searchable": 1, "filterable": 0, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" }, { "key": "找資源", @@ -159,7 +159,7 @@ "api": "csp_Zhaozy", "searchable": 1, "filterable": 0, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" }, { "key": "push_agent", @@ -168,7 +168,7 @@ "api": "csp_Push", "searchable": 1, "filterable": 0, - "ext": "http://ali.饭太硬.ml/tok" + "ext": "http://我不是.肥猫.love:63/token.php" } ] } \ No newline at end of file