mirror of
https://github.com/TeamPiped/Piped-Backend.git
synced 2024-08-14 23:51:41 +00:00
Remove org.json and fix occasional json exception.
This commit is contained in:
parent
12bcc6bc0f
commit
d4d9c71279
2 changed files with 29 additions and 21 deletions
|
@ -21,7 +21,6 @@ dependencies {
|
|||
implementation 'com.fasterxml.jackson.core:jackson-core:2.13.4'
|
||||
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.4'
|
||||
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
|
||||
implementation 'org.json:json:20220924'
|
||||
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
|
||||
implementation 'com.rometools:rome:1.18.0'
|
||||
implementation 'com.github.ipfs:java-ipfs-http-client:v1.3.3'
|
||||
|
|
|
@ -5,10 +5,14 @@ import okhttp3.MediaType;
|
|||
import okhttp3.Request;
|
||||
import okhttp3.RequestBody;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static me.kavin.piped.consts.Constants.h2client;
|
||||
import static me.kavin.piped.consts.Constants.mapper;
|
||||
import static me.kavin.piped.utils.RequestUtils.sendGet;
|
||||
import static me.kavin.piped.utils.URLUtils.silentEncode;
|
||||
|
||||
public class LbryHelper {
|
||||
|
||||
public static String getLBRYId(String videoId) throws IOException {
|
||||
|
@ -16,9 +20,10 @@ public class LbryHelper {
|
|||
if (Constants.DISABLE_LBRY)
|
||||
return null;
|
||||
|
||||
return new JSONObject(
|
||||
RequestUtils.sendGet("https://api.lbry.com/yt/resolve?video_ids=" + URLUtils.silentEncode(videoId))
|
||||
).getJSONObject("data").getJSONObject("videos").optString(videoId, null);
|
||||
return mapper.readTree(sendGet("https://api.lbry.com/yt/resolve?video_ids=" + silentEncode(videoId)))
|
||||
.at("/data/videos")
|
||||
.path(videoId)
|
||||
.asText(null);
|
||||
}
|
||||
|
||||
public static String getLBRYStreamURL(String lbryId)
|
||||
|
@ -29,24 +34,28 @@ public class LbryHelper {
|
|||
|
||||
var request = new Request.Builder()
|
||||
.url("https://api.lbry.tv/api/v1/proxy?m=get")
|
||||
.post(RequestBody.create(String.valueOf(
|
||||
new JSONObject().put("id", System.currentTimeMillis())
|
||||
.post(RequestBody.create(mapper.writeValueAsBytes(
|
||||
mapper.createObjectNode()
|
||||
.put("id", System.currentTimeMillis())
|
||||
.put("id", System.currentTimeMillis())
|
||||
.put("jsonrpc", "2.0")
|
||||
.put("method", "get")
|
||||
.put("params",
|
||||
new JSONObject()
|
||||
.set("params",
|
||||
mapper.createObjectNode()
|
||||
.put("uri", "lbry://" + lbryId)
|
||||
.put("save_file", true)))
|
||||
, MediaType.get("application/json")))
|
||||
.put("save_file", true)
|
||||
)
|
||||
), MediaType.get("application/json")))
|
||||
.build();
|
||||
|
||||
var resp = Constants.h2client.newCall(request).execute();
|
||||
|
||||
var json = new JSONObject(resp.body().string());
|
||||
|
||||
resp.close();
|
||||
|
||||
return json.getJSONObject("result").getString("streaming_url");
|
||||
try (var resp = h2client.newCall(request).execute()) {
|
||||
if (resp.isSuccessful()) {
|
||||
return mapper.readTree(resp.body().byteStream())
|
||||
.at("/result/streaming_url")
|
||||
.asText(null);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue