diff --git a/app/src/main/java/com/github/catvod/bean/alist/Item.java b/app/src/main/java/com/github/catvod/bean/alist/Item.java index bc122c80..bf8f9ebe 100644 --- a/app/src/main/java/com/github/catvod/bean/alist/Item.java +++ b/app/src/main/java/com/github/catvod/bean/alist/Item.java @@ -110,10 +110,6 @@ public class Item { return getType() == 0 || getType() == 2 || getType() == 5; } - public String getExt() { - return Util.getExt(getName()); - } - public String getVodId(String id) { return id + getPath() + "/" + getName(); } 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 8889ff36..9cf76529 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -238,7 +238,10 @@ public class AList extends Spider { private String findSubs(String path, List items) { StringBuilder sb = new StringBuilder(); - for (Item item : items) if (Util.isSub(item.getExt())) sb.append("~~~").append(item.getName()).append("@@@").append(item.getExt()).append("@@@").append(item.getVodId(path)); + for (Item item : items) { + String ext = Util.getExt(item.getName()); + if (Util.isSub(ext)) sb.append("~~~").append(item.getName()).append("@@@").append(ext).append("@@@").append(item.getVodId(path)); + } return sb.toString(); } diff --git a/app/src/main/java/com/github/catvod/spider/Samba.java b/app/src/main/java/com/github/catvod/spider/Samba.java index 8fa8b416..de9c0c34 100644 --- a/app/src/main/java/com/github/catvod/spider/Samba.java +++ b/app/src/main/java/com/github/catvod/spider/Samba.java @@ -105,7 +105,7 @@ public class Samba extends Spider { while (iterator.hasNext()) { FileIdBothDirectoryInformation item = iterator.next(); if (isFolder(item) && item.getFileName().startsWith(".")) iterator.remove(); - if (isFile(item) && !Util.MEDIA.contains(Util.getExt(item.getFileName()))) iterator.remove(); + if (isFile(item) && !Util.isMedia(item.getFileName())) iterator.remove(); } Collections.sort(items, (o1, o2) -> { if (isFolder(o1) && isFile(o2)) return -1; diff --git a/app/src/main/java/com/github/catvod/spider/WebDAV.java b/app/src/main/java/com/github/catvod/spider/WebDAV.java index fdcef656..3176bad3 100644 --- a/app/src/main/java/com/github/catvod/spider/WebDAV.java +++ b/app/src/main/java/com/github/catvod/spider/WebDAV.java @@ -144,7 +144,7 @@ public class WebDAV extends Spider { private List getSubs(List items) { List subs = new ArrayList<>(); - for (DavResource item : items) if (Util.isSub(getExt(item))) subs.add(item); + for (DavResource item : items) if (Util.isSub(item.getName())) subs.add(item); return subs; } diff --git a/app/src/main/java/com/github/catvod/utils/Util.java b/app/src/main/java/com/github/catvod/utils/Util.java index 486b846d..522b5b97 100644 --- a/app/src/main/java/com/github/catvod/utils/Util.java +++ b/app/src/main/java/com/github/catvod/utils/Util.java @@ -45,8 +45,8 @@ public class Util { return RULE.matcher(url).find(); } - public static boolean isSub(String ext) { - return SUB.contains(ext); + public static boolean isSub(String text) { + return SUB.contains(getExt(text).toLowerCase()); } public static boolean isMedia(String text) { @@ -54,7 +54,7 @@ public class Util { } public static String getExt(String name) { - return name.contains(".") ? name.substring(name.lastIndexOf(".") + 1) : name; + return name.contains(".") ? name.substring(name.lastIndexOf(".") + 1).toLowerCase() : name.toLowerCase(); } public static String getSize(double size) {