From 7c7fc7e505d1dbec7e6576113b6e31aa34875ed3 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 7 Apr 2025 14:03:39 +0800
Subject: [PATCH] Clean code

---
 app/src/main/java/com/fongmi/android/tv/api/LiveParser.java | 5 ++---
 app/src/main/java/com/fongmi/android/tv/bean/Catchup.java   | 2 +-
 app/src/main/java/com/fongmi/android/tv/bean/Flag.java      | 2 +-
 app/src/main/java/com/fongmi/android/tv/bean/Group.java     | 2 +-
 catvod/src/main/java/com/github/catvod/net/OkDns.java       | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
index 787a5fdcb..eb50c8c92 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
@@ -120,8 +120,7 @@ public class LiveParser {
         text = text.replace("\r\n", "\n").replace("\r", "");
         for (String line : text.split("\n")) {
             if (Thread.interrupted()) break;
-            String[] split = line.split(",");
-            int index = line.indexOf(",") + 1;
+            String[] split = line.split(",", 2);
             if (setting.find(line)) setting.check(line);
             if (line.contains("#genre#")) setting.clear();
             if (line.contains("#genre#")) live.getGroups().add(Group.create(split[0], live.isPass()));
@@ -129,7 +128,7 @@ public class LiveParser {
             if (split.length > 1 && split[1].contains("://")) {
                 Group group = live.getGroups().get(live.getGroups().size() - 1);
                 Channel channel = group.find(Channel.create(split[0]));
-                channel.addUrls(line.substring(index).split("#"));
+                channel.addUrls(split[1].split("#"));
                 setting.copy(channel);
             }
         }
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java b/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
index 9fadee74d..2a8a66682 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
@@ -100,7 +100,7 @@ public class Catchup {
     }
 
     private String append(String url, String result) {
-        String[] splits = getReplace().split(",");
+        String[] splits = getReplace().split(",", 2);
         if (splits.length == 2) url = url.replaceAll(splits[0], splits[1]);
         if (!TextUtils.isEmpty(URI.create(url).getQuery())) result = result.replace("?", "&");
         return url + result;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java
index bef0e9768..ae80e49e8 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java
@@ -91,7 +91,7 @@ public class Flag implements Parcelable {
     public void createEpisode(String data) {
         String[] urls = data.contains("#") ? data.split("#") : new String[]{data};
         for (int i = 0; i < urls.length; i++) {
-            String[] split = urls[i].split("\\$");
+            String[] split = urls[i].split("\\$", 2);
             String number = String.format(Locale.getDefault(), "%02d", i + 1);
             Episode episode = split.length > 1 ? Episode.create(split[0].isEmpty() ? number : split[0].trim(), split[1]) : Episode.create(number, urls[i]);
             if (!getEpisodes().contains(episode)) getEpisodes().add(episode);
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java
index 94026f2f2..163ea232e 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Group.java
@@ -58,7 +58,7 @@ public class Group {
     }
 
     private void parse(boolean pass) {
-        String[] splits = name.split("_");
+        String[] splits = name.split("_", 2);
         setName(splits[0]);
         if (pass || splits.length == 1) return;
         setPass(splits[1]);
diff --git a/catvod/src/main/java/com/github/catvod/net/OkDns.java b/catvod/src/main/java/com/github/catvod/net/OkDns.java
index 7c3faccdd..37ddad6fa 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkDns.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkDns.java
@@ -33,7 +33,7 @@ public class OkDns implements Dns {
     public synchronized void addAll(List<String> hosts) {
         for (String host : hosts) {
             if (!host.contains("=")) continue;
-            String[] splits = host.split("=");
+            String[] splits = host.split("=", 2);
             String oldHost = splits[0];
             String newHost = splits[1];
             map.put(oldHost, newHost);