hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into release

Browse Source
pull/268/head
FongMi 2 years ago
parent 2433b64151 e9e2d9e3f7
commit 5ba778d7e7
9 changed files with 27 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
  2. 3
      app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
  3. 5
      app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
  4. 7
      app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java
  5. 6
      app/src/main/java/com/fongmi/android/tv/player/ParseJob.java
  6. 4
      app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java
  7. 3
      app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
  8. 14
      catvod/src/main/java/com/github/catvod/utils/Json.java
  9. 3
      pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java

5
app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
Unescape View File

@ -12,7 +12,6 @@ import com.fongmi.android.tv.utils.UrlUtil;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Json;
import com.github.catvod.utils.Path;
import com.google.gson.JsonParser;
import java.util.Arrays;
import java.util.HashMap;
@ -240,8 +239,8 @@ public class LiveParser {
private void header(String line) {
try {
if (line.contains("#EXTHTTP:")) header = Json.toMap(JsonParser.parseString(line.split("#EXTHTTP:")[1].trim()));
if (line.contains("header=")) header = Json.toMap(JsonParser.parseString(line.split("header=")[1].trim()));
if (line.contains("#EXTHTTP:")) header = Json.toMap(Json.parse(line.split("#EXTHTTP:")[1].trim()));
if (line.contains("header=")) header = Json.toMap(Json.parse(line.split("header=")[1].trim()));
} catch (Exception e) {
header = null;
}

3
app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
Unescape View File

@ -20,7 +20,6 @@ import com.fongmi.android.tv.utils.Notify;
import com.github.catvod.utils.Json;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.util.ArrayList;
import java.util.List;
@ -112,7 +111,7 @@ public class LiveConfig {
if (Json.invalid(text)) {
parseText(text, callback);
} else {
checkJson(JsonParser.parseString(text).getAsJsonObject(), callback);
checkJson(Json.parse(text).getAsJsonObject(), callback);
}
}

5
app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
Unescape View File

@ -23,7 +23,6 @@ import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Json;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.json.JSONObject;
@ -129,7 +128,7 @@ public class VodConfig {
private void loadConfig(Callback callback) {
try {
checkJson(JsonParser.parseString(Decoder.getJson(config.getUrl())).getAsJsonObject(), callback);
checkJson(Json.parse(Decoder.getJson(config.getUrl())).getAsJsonObject(), callback);
} catch (Throwable e) {
if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));
else loadCache(callback, e);
@ -138,7 +137,7 @@ public class VodConfig {
}
private void loadCache(Callback callback, Throwable e) {
if (!TextUtils.isEmpty(config.getJson())) checkJson(JsonParser.parseString(config.getJson()).getAsJsonObject(), callback);
if (!TextUtils.isEmpty(config.getJson())) checkJson(Json.parse(config.getJson()).getAsJsonObject(), callback);
else App.post(() -> callback.error(Notify.getError(R.string.error_config_get, e)));
}

7
app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java
Unescape View File

@ -11,6 +11,7 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class FilterAdapter implements JsonDeserializer<LinkedHashMap<String, List<Filter>>> {
@ -19,12 +20,12 @@ public class FilterAdapter implements JsonDeserializer<LinkedHashMap<String, Lis
LinkedHashMap<String, List<Filter>> filterMap = new LinkedHashMap<>();
JsonObject filters = json.getAsJsonObject();
if (filters == null) return filterMap;
for (String key : filters.keySet()) {
for (Map.Entry<String, JsonElement> entry : filters.entrySet()) {
List<Filter> items = new ArrayList<>();
JsonElement element = filters.get(key);
JsonElement element = filters.get(entry.getKey());
if (element.isJsonObject()) items.add(Filter.objectFrom(element).check().trans());
else for (JsonElement item : element.getAsJsonArray()) items.add(Filter.objectFrom(item).check().trans());
filterMap.put(key, items);
filterMap.put(entry.getKey(), items);
}
return filterMap;
}

6
app/src/main/java/com/fongmi/android/tv/player/ParseJob.java
Unescape View File

@ -11,8 +11,8 @@ import com.fongmi.android.tv.utils.UrlUtil;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Json;
import com.google.common.net.HttpHeaders;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.util.ArrayList;
import java.util.HashMap;
@ -107,7 +107,7 @@ public class ParseJob implements ParseCallback {
private void jsonParse(Parse item, String webUrl, boolean error) throws Exception {
String body = OkHttp.newCall(item.getUrl() + webUrl, Headers.of(item.getHeaders())).execute().body().string();
JsonObject object = JsonParser.parseString(body).getAsJsonObject();
JsonObject object = Json.parse(body).getAsJsonObject();
object = object.has("data") ? object.getAsJsonObject("data") : object;
boolean illegal = body.contains("不存在") || body.contains("已过期");
String url = illegal ? "" : Json.safeString(object, "url");
@ -188,7 +188,7 @@ public class ParseJob implements ParseCallback {
private Map<String, String> getHeader(JsonObject object) {
Map<String, String> headers = new HashMap<>();
for (String key : object.keySet()) if (key.equalsIgnoreCase(HttpHeaders.USER_AGENT) || key.equalsIgnoreCase(HttpHeaders.REFERER)) headers.put(UrlUtil.fixHeader(key), object.get(key).getAsString());
for (Map.Entry<String, JsonElement> entry : object.entrySet()) if (entry.getKey().equalsIgnoreCase(HttpHeaders.USER_AGENT) || entry.getKey().equalsIgnoreCase(HttpHeaders.REFERER)) headers.put(UrlUtil.fixHeader(entry.getKey()), object.get(entry.getKey()).getAsString());
if (headers.isEmpty()) return parse.getHeaders();
return headers;
}

4
app/src/main/java/com/fongmi/android/tv/player/extractor/BiliBili.java
Unescape View File

@ -4,9 +4,9 @@ import android.net.Uri;
import com.fongmi.android.tv.player.Source;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Json;
import com.github.catvod.utils.Util;
import com.google.common.net.HttpHeaders;
import com.google.gson.JsonParser;
import okhttp3.Headers;
@ -22,7 +22,7 @@ public class BiliBili implements Source.Extractor {
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, Util.CHROME)).execute().body().string();
return JsonParser.parseString(result).getAsJsonObject().get("data").getAsJsonObject().get("durl").getAsJsonArray().get(0).getAsJsonObject().get("url").getAsString();
return Json.parse(result).getAsJsonObject().get("data").getAsJsonObject().get("durl").getAsJsonArray().get(0).getAsJsonObject().get("url").getAsString();
}
@Override

3
app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
Unescape View File

@ -26,7 +26,6 @@ import com.fongmi.android.tv.R;
import com.fongmi.android.tv.Setting;
import com.github.catvod.utils.Json;
import com.google.common.net.HttpHeaders;
import com.google.gson.JsonParser;
import java.io.ByteArrayOutputStream;
import java.util.Map;
@ -88,7 +87,7 @@ public class ImgUtil {
}
private static void addHeader(LazyHeaders.Builder builder, String header) {
Map<String, String> map = Json.toMap(JsonParser.parseString(header));
Map<String, String> map = Json.toMap(Json.parse(header));
for (Map.Entry<String, String> entry : map.entrySet()) builder.addHeader(UrlUtil.fixHeader(entry.getKey()), entry.getValue());
}

14
catvod/src/main/java/com/github/catvod/utils/Json.java
Unescape View File

@ -15,6 +15,14 @@ import java.util.Map;
public class Json {
public static JsonElement parse(String json) {
try {
return JsonParser.parseString(json);
} catch (Throwable e) {
return new JsonParser().parse(json);
}
}
public static boolean valid(String text) {
try {
new JSONObject(text);
@ -54,7 +62,7 @@ public class Json {
public static JsonObject safeObject(JsonElement element) {
try {
if (element.isJsonPrimitive()) element = JsonParser.parseString(element.getAsJsonPrimitive().getAsString());
if (element.isJsonPrimitive()) element = parse(element.getAsJsonPrimitive().getAsString());
return element.getAsJsonObject();
} catch (Exception e) {
return new JsonObject();
@ -64,14 +72,14 @@ public class Json {
public static Map<String, String> toMap(JsonElement element) {
Map<String, String> map = new HashMap<>();
JsonObject object = safeObject(element);
for (String key : object.keySet()) map.put(key, safeString(object, key));
for (Map.Entry<String, JsonElement> entry : object.entrySet()) map.put(entry.getKey(), safeString(object, entry.getKey()));
return map;
}
public static ArrayMap<String, String> toArrayMap(JsonElement element) {
ArrayMap<String, String> map = new ArrayMap<>();
JsonObject object = safeObject(element);
for (String key : object.keySet()) map.put(key, safeString(object, key));
for (Map.Entry<String, JsonElement> entry : object.entrySet()) map.put(entry.getKey(), safeString(object, entry.getKey()));
return map;
}

3
pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java
Unescape View File

@ -11,7 +11,6 @@ import com.github.catvod.utils.Json;
import com.google.common.net.HttpHeaders;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.io.ByteArrayInputStream;
import java.util.HashMap;
@ -91,7 +90,7 @@ public class Spider extends com.github.catvod.crawler.Spider {
@Override
public Object[] proxyLocal(Map<String, String> params) throws Exception {
List<PyObject> list = app.callAttr("localProxy", obj, gson.toJson(params)).asList();
JsonObject action = JsonParser.parseString(list.get(2).toString()).getAsJsonObject();
JsonObject action = Json.parse(list.get(2).toString()).getAsJsonObject();
Map<String, String> headers = Json.toMap(action.get("header"));
String url = action.get("url").getAsString();
String content = list.get(3).toString();

Write Preview
Loading…
Cancel
Save