dongge
/
CatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

This commit is contained in:
FongMi 2025-04-09 11:04:12 +08:00
parent 1c4ebf9aeb
commit 843cde8576
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/catvod/bean/alist/Item.java
View File

@ -110,10 +110,6 @@ public class Item {
return getType() == 0 || getType() == 2 || getType() == 5; return getType() == 0 || getType() == 2 || getType() == 5;
} }
public String getExt() {
return Util.getExt(getName());
}
public String getVodId(String id) { public String getVodId(String id) {
return id + getPath() + "/" + getName(); return id + getPath() + "/" + getName();
} }

5
app/src/main/java/com/github/catvod/spider/AList.java
View File

@ -238,7 +238,10 @@ public class AList extends Spider {
private String findSubs(String path, List<Item> items) { private String findSubs(String path, List<Item> items) {
StringBuilder sb = new StringBuilder(); 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(); return sb.toString();
} }

2
app/src/main/java/com/github/catvod/spider/Samba.java
View File

@ -105,7 +105,7 @@ public class Samba extends Spider {
while (iterator.hasNext()) { while (iterator.hasNext()) {
FileIdBothDirectoryInformation item = iterator.next(); FileIdBothDirectoryInformation item = iterator.next();
if (isFolder(item) && item.getFileName().startsWith(".")) iterator.remove(); 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) -> { Collections.sort(items, (o1, o2) -> {
if (isFolder(o1) && isFile(o2)) return -1; if (isFolder(o1) && isFile(o2)) return -1;

2
app/src/main/java/com/github/catvod/spider/WebDAV.java
View File

@ -144,7 +144,7 @@ public class WebDAV extends Spider {
private List<DavResource> getSubs(List<DavResource> items) { private List<DavResource> getSubs(List<DavResource> items) {
List<DavResource> subs = new ArrayList<>(); List<DavResource> 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; return subs;
} }

6
app/src/main/java/com/github/catvod/utils/Util.java
View File

@ -45,8 +45,8 @@ public class Util {
return RULE.matcher(url).find(); return RULE.matcher(url).find();
} }
public static boolean isSub(String ext) { public static boolean isSub(String text) {
return SUB.contains(ext); return SUB.contains(getExt(text).toLowerCase());
} }
public static boolean isMedia(String text) { public static boolean isMedia(String text) {
@ -54,7 +54,7 @@ public class Util {
} }
public static String getExt(String name) { 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) { public static String getSize(double size) {