From bdee4047934f046fa5eaf7295364ea4ca6fd0c76 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 16 Dec 2023 00:09:18 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/android/tv/bean/Config.java | 2 ++ .../fongmi/android/tv/server/process/Cache.java | 16 ++++++++++++---- .../java/com/fongmi/quickjs/method/Local.java | 12 +++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java index 016c3bc6f..48f72f4d8 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java @@ -8,6 +8,7 @@ import androidx.room.PrimaryKey; import com.fongmi.android.tv.App; import com.fongmi.android.tv.db.AppDatabase; +import com.github.catvod.utils.Prefers; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; @@ -222,6 +223,7 @@ public class Config { public Config update() { if (isEmpty()) return this; setTime(System.currentTimeMillis()); + Prefers.put("config_" + getType(), getUrl()); AppDatabase.get().getConfigDao().update(this); return this; } diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/Cache.java b/app/src/main/java/com/fongmi/android/tv/server/process/Cache.java index 818f50f27..a3f35bafc 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/Cache.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/Cache.java @@ -1,5 +1,7 @@ package com.fongmi.android.tv.server.process; +import android.text.TextUtils; + import com.fongmi.android.tv.server.Nano; import com.github.catvod.utils.Prefers; @@ -15,17 +17,23 @@ public class Cache implements Process { return path.equals("/cache"); } + private String getKey(String rule, String key) { + return "cache_" + (TextUtils.isEmpty(rule) ? "" : rule + "_") + key; + } + @Override public NanoHTTPD.Response doResponse(NanoHTTPD.IHTTPSession session, String path, Map files) { Map params = session.getParms(); + String rule = params.get("rule"); + String key = params.get("key"); switch (Objects.requireNonNullElse(params.get("do"), "")) { case "get": - return Nano.success(Prefers.getString("cache_" + params.get("key"))); + return Nano.success(getKey(rule, key)); case "set": - Prefers.put("cache_" + params.get("key"), params.get("value")); + Prefers.put(getKey(rule, key), params.get("value")); return Nano.success(); - case "delete": - Prefers.remove("cache_" + params.get("key")); + case "del": + Prefers.remove(getKey(rule, key)); return Nano.success(); default: return Nano.error(null); diff --git a/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java index e3a516aa1..facba06de 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java @@ -1,5 +1,7 @@ package com.fongmi.quickjs.method; +import android.text.TextUtils; + import androidx.annotation.Keep; import com.github.catvod.utils.Prefers; @@ -7,21 +9,25 @@ import com.whl.quickjs.wrapper.JSMethod; public class Local { + private String getKey(String rule, String key) { + return "cache_" + (TextUtils.isEmpty(rule) ? "" : rule + "_") + key; + } + @Keep @JSMethod public String get(String rule, String key) { - return Prefers.getString(rule + "_" + key); + return Prefers.getString(getKey(rule, key)); } @Keep @JSMethod public void set(String rule, String key, String value) { - Prefers.put(rule + "_" + key, value); + Prefers.put(getKey(rule, key), value); } @Keep @JSMethod public void delete(String rule, String key) { - Prefers.remove(rule + "_" + key); + Prefers.remove(getKey(rule, key)); } }