From 58adcf3a7f814e02967138ecfdec87dbcef97b9c Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 6 Apr 2025 19:07:14 +0800 Subject: [PATCH] Clean code --- app/build.gradle | 1 + app/src/main/java/com/github/catvod/bean/Result.java | 7 +++++-- app/src/main/java/com/github/catvod/spider/Local.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e9cf110..ef040da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation 'wang.harlon.quickjs:wrapper-android:2.4.5' implementation 'com.google.code.gson:gson:2.11.0' implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' + implementation 'com.hierynomus:smbj:0.14.0' implementation 'com.orhanobut:logger:2.2.0' implementation 'org.jsoup:jsoup:1.18.3' } \ No newline at end of file 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 0f3dcf2..ac2acce 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -83,8 +83,11 @@ public class Result { return Result.get().classes(classes).vod(list).string(); } - public static String string(List list) { - return Result.get().vod(list).string(); + public static String string(List list) { + if (list == null || list.isEmpty()) return ""; + if (list.get(0) instanceof Vod) return Result.get().vod((List) list).string(); + if (list.get(0) instanceof Class) return Result.get().classes((List) list).string(); + return ""; } public static String string(Vod item) { diff --git a/app/src/main/java/com/github/catvod/spider/Local.java b/app/src/main/java/com/github/catvod/spider/Local.java index d77f3cc..9aba460 100644 --- a/app/src/main/java/com/github/catvod/spider/Local.java +++ b/app/src/main/java/com/github/catvod/spider/Local.java @@ -42,13 +42,13 @@ public class Local extends Spider { List classes = new ArrayList<>(); classes.add(new Class(Environment.getExternalStorageDirectory().getAbsolutePath(), "本地文件", "1")); File[] files = new File("/storage").listFiles(); - if (files == null) return Result.string(classes, new ArrayList<>()); + if (files == null) return Result.string(classes); List exclude = Arrays.asList("emulated", "sdcard", "self"); for (File file : files) { if (exclude.contains(file.getName())) continue; classes.add(new Class(file.getAbsolutePath(), file.getName(), "1")); } - return Result.string(classes, new ArrayList<>()); + return Result.string(classes); } @Override