From e1ceb3cf8dcb478b5d32db46835e5ae8ac5b5ce6 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 24 Mar 2025 21:42:04 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/player/Source.java | 2 -- .../android/tv/player/extractor/Force.java | 4 ++- .../android/tv/player/extractor/Proxy.java | 25 ------------------- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/java/com/fongmi/android/tv/player/extractor/Proxy.java diff --git a/app/src/main/java/com/fongmi/android/tv/player/Source.java b/app/src/main/java/com/fongmi/android/tv/player/Source.java index 1351be3be..18806a4b3 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Source.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Source.java @@ -7,7 +7,6 @@ import com.fongmi.android.tv.bean.Flag; import com.fongmi.android.tv.bean.Result; import com.fongmi.android.tv.player.extractor.Force; import com.fongmi.android.tv.player.extractor.JianPian; -import com.fongmi.android.tv.player.extractor.Proxy; import com.fongmi.android.tv.player.extractor.Push; import com.fongmi.android.tv.player.extractor.TVBus; import com.fongmi.android.tv.player.extractor.Thunder; @@ -40,7 +39,6 @@ public class Source { extractors = new ArrayList<>(); extractors.add(new Force()); extractors.add(new JianPian()); - extractors.add(new Proxy()); extractors.add(new Push()); extractors.add(new Thunder()); extractors.add(new TVBus()); diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Force.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Force.java index 4cb1f40ff..011ce1e18 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Force.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/Force.java @@ -14,16 +14,18 @@ import com.github.catvod.net.OkHttp; import com.google.common.net.HttpHeaders; import java.util.HashSet; +import java.util.regex.Pattern; import okhttp3.Headers; public class Force implements Source.Extractor { + private static final Pattern PATTERN = Pattern.compile("(?i)(p[2-9]p|mitv)"); private final HashSet set = new HashSet<>(); @Override public boolean match(String scheme, String host) { - return !"push".equals(scheme) && scheme.startsWith("p") || "mitv".equals(scheme); + return PATTERN.matcher(scheme).find(); } private void init(String scheme) { diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Proxy.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Proxy.java deleted file mode 100644 index 1a8ac53ee..000000000 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Proxy.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.fongmi.android.tv.player.extractor; - -import com.fongmi.android.tv.player.Source; -import com.fongmi.android.tv.server.Server; - -public class Proxy implements Source.Extractor { - - @Override - public boolean match(String scheme, String host) { - return "proxy".equals(scheme); - } - - @Override - public String fetch(String url) throws Exception { - return url.replace("proxy://", Server.get().getAddress("/proxy?")); - } - - @Override - public void stop() { - } - - @Override - public void exit() { - } -}