From 8b6980b3377e640c224cd3a84a9ac712d74e74ad Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 17 Nov 2023 14:39:56 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/android/tv/api/ApiConfig.java | 2 +- .../java/com/fongmi/android/tv/api/JsLoader.java | 2 +- .../com/fongmi/android/tv/model/SiteViewModel.java | 12 ++++++------ .../fongmi/android/tv/ui/custom/CustomWebView.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index 04da12288..f670f4161 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -229,7 +229,7 @@ public class ApiConfig { return ext; } - public Spider getCSP(Site site) { + public Spider getSpider(Site site) { boolean js = site.getApi().contains(".js"); boolean py = site.getApi().startsWith("py_"); boolean csp = site.getApi().startsWith("csp_"); diff --git a/app/src/main/java/com/fongmi/android/tv/api/JsLoader.java b/app/src/main/java/com/fongmi/android/tv/api/JsLoader.java index 4b742fda1..f51c61284 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/JsLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/JsLoader.java @@ -55,7 +55,7 @@ public class JsLoader { private Spider find(Map params) { if (!params.containsKey("siteKey")) return spiders.get(recent); Site site = ApiConfig.get().getSite(params.get("siteKey")); - return site.isEmpty() ? null : ApiConfig.get().getCSP(site); + return site.isEmpty() ? null : ApiConfig.get().getSpider(site); } public Object[] proxyInvoke(Map params) { diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index 76098fa08..6567a8b9b 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -66,7 +66,7 @@ public class SiteViewModel extends ViewModel { execute(result, () -> { Site site = ApiConfig.get().getHome(); if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String homeContent = spider.homeContent(true); SpiderDebug.log(homeContent); ApiConfig.get().setRecent(site); @@ -94,7 +94,7 @@ public class SiteViewModel extends ViewModel { execute(result, () -> { Site site = ApiConfig.get().getSite(key); if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String categoryContent = spider.categoryContent(tid, page, filter, extend); SpiderDebug.log(categoryContent); ApiConfig.get().setRecent(site); @@ -117,7 +117,7 @@ public class SiteViewModel extends ViewModel { execute(result, () -> { Site site = ApiConfig.get().getSite(key); if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String detailContent = spider.detailContent(Arrays.asList(id)); SpiderDebug.log(detailContent); ApiConfig.get().setRecent(site); @@ -152,7 +152,7 @@ public class SiteViewModel extends ViewModel { Source.get().stop(); Site site = ApiConfig.get().getSite(key); if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String playerContent = spider.playerContent(flag, id, ApiConfig.get().getFlags()); SpiderDebug.log(playerContent); ApiConfig.get().setRecent(site); @@ -197,7 +197,7 @@ public class SiteViewModel extends ViewModel { public void searchContent(Site site, String keyword, boolean quick) throws Throwable { if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String searchContent = spider.searchContent(Trans.t2s(keyword), quick); SpiderDebug.log(site.getName() + "," + searchContent); post(site, Result.fromJson(searchContent)); @@ -214,7 +214,7 @@ public class SiteViewModel extends ViewModel { public void searchContent(Site site, String keyword, String page) { execute(result, () -> { if (site.getType() == 3) { - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); String searchContent = spider.searchContent(Trans.t2s(keyword), false, page); SpiderDebug.log(site.getName() + "," + searchContent); Result result = Result.fromJson(searchContent); diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java index f4fd84e38..86774209d 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java @@ -105,7 +105,7 @@ public class CustomWebView extends WebView { private boolean isVideoFormat(String url, Map headers) { try { Site site = ApiConfig.get().getSite(key); - Spider spider = ApiConfig.get().getCSP(site); + Spider spider = ApiConfig.get().getSpider(site); if (spider.manualVideoCheck()) return spider.isVideoFormat(url); return Sniffer.isVideoFormat(url, headers); } catch (Exception ignored) {