From 2eac4a22b308afb5b3221b9a8599915c364033e1 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 3 Jan 2023 12:05:34 +0800 Subject: [PATCH] Update --- json/live.json | 5 +++++ tools/src/main/java/com/fongmi/tools/Run.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/json/live.json b/json/live.json index b55ffdca..d8a75f7b 100644 --- a/json/live.json +++ b/json/live.json @@ -57,6 +57,8 @@ }, { "urls": [ + "http://baidu.douyincdn.freetvtv.com/tvbjade/m2.m3u8", + "https://pull-l3-cny.douyincdn.com/live/e07fb43ab773bd88a01b9a96f354bfa9.m3u8", "http://113.64.147.149:808/hls/67/index.m3u8", "http://113.64.147.170:808/hls/67/index.m3u8" ], @@ -142,6 +144,7 @@ }, { "urls": [ + "https://pull-l3-cny.douyincdn.com/live/281ad35ffd611b16b5d4b4e55d86de69.m3u8", "http://198.16.64.10:8278/j2_twn/playlist.m3u8?tid=MA8A1176878411768784&ct=19225&tsum=fea41bb592165942b9971148376f8b70", "http://198.16.64.10:8278/j2_twn/playlist.m3u8?tid=m22905da1d346&ct=18336&tsum=3b4998c4f5367bb820165f66b0caab0e", "http://120.84.96.196:808/hls/86/index.m3u8", @@ -204,6 +207,7 @@ }, { "urls": [ + "http://baidu.douyincdn.freetvtv.com/vius/m2.m3u8", "http://198.16.64.10:8278/viu_twn/playlist.m3u8?tid=MF2F6219999362199993&ct=19225&tsum=0315b071e42f6b8b6f49b6ca58b7393b" ], "number": "019", @@ -295,6 +299,7 @@ }, { "urls": [ + "https://pull-l3-cny.douyincdn.com/live/8f0f5b53f8ad921929fc9ac8771cbd82.m3u8", "http://198.16.64.10:8278/Wlt/playlist.m3u8?tid=MC9C7523788875237888&ct=19225&tsum=fc74aa160d3ca61369c2e5f3ae79ee8e" ], "number": "028", diff --git a/tools/src/main/java/com/fongmi/tools/Run.java b/tools/src/main/java/com/fongmi/tools/Run.java index b2d0a190..0416a611 100644 --- a/tools/src/main/java/com/fongmi/tools/Run.java +++ b/tools/src/main/java/com/fongmi/tools/Run.java @@ -12,6 +12,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Scanner; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -33,13 +34,17 @@ public class Run { } private void start() throws IOException { - parseOnline(new OkHttpClient().newCall(new Request.Builder().url("http://home.jundie.top:81/Cat/tv/live.txt").build()).execute().body().string()); + Scanner scanner = new Scanner(System.in); + System.out.print("請輸入網址或檔名:"); + String text = scanner.nextLine(); + if (text.startsWith("http")) parse(new OkHttpClient().newCall(new Request.Builder().url(text).build()).execute().body().string()); + else parse(Util.getFile(getClass(), text)); //parseTxt(Util.getFile(getClass(), "live.txt")); System.out.println(gson.toJson(groups)); writeFile(); } - private void parseOnline(String text) { + private void parse(String text) { for (String line : text.split("\n")) { String[] split = line.split(","); if (split.length < 2) continue;