From 74ad0ddd9b6afdaa64bcc73740050a4641c96d39 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 18 Oct 2023 23:42:40 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/ui/custom/dialog/UaDialog.java | 3 +-- .../java/com/fongmi/android/tv/impl/NewPipeImpl.java | 4 ++-- .../com/fongmi/android/tv/player/extractor/BiliBili.java | 4 ++-- .../com/fongmi/android/tv/player/extractor/Youtube.java | 6 +++--- .../main/java/com/fongmi/android/tv/utils/Sniffer.java | 1 - .../com/fongmi/android/tv/ui/custom/dialog/UaDialog.java | 3 +-- .../java/com/github/catvod/net/OkhttpInterceptor.java | 9 ++++----- catvod/src/main/java/com/github/catvod/utils/Util.java | 1 + 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java index abfa65a4e..0f2051a08 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java @@ -19,7 +19,6 @@ import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.custom.CustomTextListener; import com.fongmi.android.tv.utils.QRCode; import com.fongmi.android.tv.utils.ResUtil; -import com.fongmi.android.tv.utils.Sniffer; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.greenrobot.eventbus.EventBus; @@ -89,7 +88,7 @@ public class UaDialog implements DialogInterface.OnDismissListener { private void detect(String s) { if (append && s.equalsIgnoreCase("c")) { append = false; - binding.text.setText(Sniffer.CHROME); + binding.text.setText(com.github.catvod.utils.Util.CHROME); } else if (append && s.equalsIgnoreCase("o")) { append = false; binding.text.setText(Util.userAgent); diff --git a/app/src/main/java/com/fongmi/android/tv/impl/NewPipeImpl.java b/app/src/main/java/com/fongmi/android/tv/impl/NewPipeImpl.java index 68793d18b..d9f401b44 100644 --- a/app/src/main/java/com/fongmi/android/tv/impl/NewPipeImpl.java +++ b/app/src/main/java/com/fongmi/android/tv/impl/NewPipeImpl.java @@ -2,8 +2,8 @@ package com.fongmi.android.tv.impl; import androidx.annotation.NonNull; -import com.fongmi.android.tv.utils.Sniffer; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Util; import com.google.common.net.HttpHeaders; import org.schabi.newpipe.extractor.downloader.Downloader; @@ -26,7 +26,7 @@ public class NewPipeImpl extends Downloader { RequestBody reqBody = null; byte[] dataToSend = request.dataToSend(); if (dataToSend != null) reqBody = RequestBody.create(dataToSend, null); - okhttp3.Request.Builder builder = new okhttp3.Request.Builder().method(request.httpMethod(), reqBody).url(url).addHeader(HttpHeaders.USER_AGENT, Sniffer.CHROME); + okhttp3.Request.Builder builder = new okhttp3.Request.Builder().method(request.httpMethod(), reqBody).url(url).addHeader(HttpHeaders.USER_AGENT, Util.CHROME); for (Map.Entry> pair : request.headers().entrySet()) { String headerName = pair.getKey(); List headerValueList = pair.getValue(); diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java index 8a7eeed6e..e1cc0ab91 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java @@ -3,8 +3,8 @@ package com.fongmi.android.tv.player.extractor; import android.net.Uri; import com.fongmi.android.tv.player.Source; -import com.fongmi.android.tv.utils.Sniffer; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Util; import com.google.common.net.HttpHeaders; import com.google.gson.JsonParser; @@ -21,7 +21,7 @@ public class BiliBili implements Source.Extractor { public String fetch(String url) throws Exception { String room = Uri.parse(url).getPath().replace("/", ""); String api = String.format("https://api.live.bilibili.com/room/v1/Room/playUrl?cid=%s&qn=20000&platform=h5", room); - String result = OkHttp.newCall(api, Headers.of(HttpHeaders.USER_AGENT, Sniffer.CHROME)).execute().body().string(); + String result = OkHttp.newCall(api, Headers.of(HttpHeaders.USER_AGENT, Util.CHROME)).execute().body().string(); return JsonParser.parseString(result).getAsJsonObject().get("data").getAsJsonObject().get("durl").getAsJsonArray().get(0).getAsJsonObject().get("url").getAsString(); } diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Youtube.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Youtube.java index 132a47c89..75b5bb553 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Youtube.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/Youtube.java @@ -2,8 +2,8 @@ package com.fongmi.android.tv.player.extractor; import com.fongmi.android.tv.impl.NewPipeImpl; import com.fongmi.android.tv.player.Source; -import com.fongmi.android.tv.utils.Sniffer; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Util; import com.google.common.net.HttpHeaders; import org.schabi.newpipe.extractor.NewPipe; @@ -34,10 +34,10 @@ public class Youtube implements Source.Extractor { @Override public String fetch(String url) throws Exception { - String html = OkHttp.newCall(url, Headers.of(HttpHeaders.USER_AGENT, Sniffer.CHROME)).execute().body().string(); + String html = OkHttp.newCall(url, Headers.of(HttpHeaders.USER_AGENT, Util.CHROME)).execute().body().string(); Matcher matcher = Pattern.compile("hlsManifestUrl\\S*?(https\\S*?\\.m3u8)").matcher(html); if (matcher.find()) { - html = OkHttp.newCall(matcher.group(1), Headers.of(HttpHeaders.USER_AGENT, Sniffer.CHROME)).execute().body().string(); + html = OkHttp.newCall(matcher.group(1), Headers.of(HttpHeaders.USER_AGENT, Util.CHROME)).execute().body().string(); return find(html); } else { LinkHandler handler = YoutubeStreamLinkHandlerFactory.getInstance().fromUrl(url); diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java index 1bee80e9a..88206ed2c 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java @@ -20,7 +20,6 @@ public class Sniffer { private static final String TAG = Sniffer.class.getSimpleName(); public static final Pattern CLICKER = Pattern.compile("\\[a=cr:(\\{.*?\\})\\/](.*?)\\[\\/a]"); - public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"; public static final String RULE = "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)\\?.*|http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)|http((?!http).)*?video/tos*"; public static final List PUSH = Arrays.asList("smb", "http", "https", "thunder", "magnet", "ed2k", "mitv", "jianpian"); public static final List THUNDER = Arrays.asList("thunder", "magnet", "ed2k"); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java index 5668814d8..2dac90fca 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java @@ -13,7 +13,6 @@ import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.databinding.DialogUaBinding; import com.fongmi.android.tv.impl.UaCallback; import com.fongmi.android.tv.ui.custom.CustomTextListener; -import com.fongmi.android.tv.utils.Sniffer; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import okhttp3.internal.Util; @@ -69,7 +68,7 @@ public class UaDialog { private void detect(String s) { if (append && s.equalsIgnoreCase("c")) { append = false; - binding.text.setText(Sniffer.CHROME); + binding.text.setText(com.github.catvod.utils.Util.CHROME); } else if (append && s.equalsIgnoreCase("o")) { append = false; binding.text.setText(Util.userAgent); diff --git a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java b/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java index 70bb4a8f9..23c9aa443 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java +++ b/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java @@ -3,6 +3,7 @@ package com.github.catvod.net; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.github.catvod.utils.Util; import com.google.common.net.HttpHeaders; import java.io.IOException; @@ -19,8 +20,6 @@ import okio.Okio; public class OkhttpInterceptor implements Interceptor { - public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"; - @NonNull @Override public Response intercept(@NonNull Chain chain) throws IOException { @@ -49,8 +48,8 @@ public class OkhttpInterceptor implements Interceptor { } private Request getRequest(@NonNull Chain chain) { - Request original = chain.request(); - if (original.url().host().equals("gitcode.net")) return original.newBuilder().addHeader(HttpHeaders.USER_AGENT, CHROME).build(); - return original; + Request request = chain.request(); + if (request.url().host().equals("gitcode.net")) return request.newBuilder().addHeader(HttpHeaders.USER_AGENT, Util.CHROME).build(); + return request; } } diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java index c5fc51698..2bce04819 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -20,6 +20,7 @@ import java.util.Formatter; public class Util { + public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"; public static final String[] UNITS = new String[]{"bytes", "KB", "MB", "GB", "TB"}; public static String getDeviceId() {