From f58282bfa53830ce545b4f50db8f6bdd870e5914 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 10 Jan 2024 14:23:57 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/android/tv/api/Decoder.java | 6 ++---- .../java/com/fongmi/android/tv/api/loader/JarLoader.java | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java index 9a101df54..63c0d1611 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java +++ b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java @@ -46,13 +46,11 @@ public class Decoder { } } - public static File getSpider(String url, String md5) { + public static File getSpider(String url) { try { File file = Path.jar(url); - if (md5.length() > 0 && Util.equals(url, md5)) return file; String data = extract(getData(url.substring(4))); - if (data.isEmpty()) return Path.jar(url); - return Path.write(file, Base64.decode(data, Base64.DEFAULT)); + return data.isEmpty() ? file : Path.write(file, Base64.decode(data, Base64.DEFAULT)); } catch (Exception ignored) { return Path.jar(url); } diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java index 843f10340..101f3d729 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java @@ -82,12 +82,12 @@ public class JarLoader { public void parseJar(String key, String jar) { String[] texts = jar.split(";md5;"); - String md5 = !jar.startsWith("file") && texts.length > 1 ? texts[1].trim() : ""; + String md5 = texts.length > 1 ? texts[1].trim() : ""; jar = texts[0]; - if (jar.startsWith("img+")) { - load(key, Decoder.getSpider(jar, md5)); - } else if (md5.length() > 0 && Util.equals(jar, md5)) { + if (md5.length() > 0 && Util.equals(jar, md5)) { load(key, Path.jar(jar)); + } else if (jar.startsWith("img+")) { + load(key, Decoder.getSpider(jar)); } else if (jar.startsWith("http")) { load(key, download(jar)); } else if (jar.startsWith("file")) {