jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Camsoda JSON parsing

This commit is contained in:
0xboobface 2019-06-01 15:32:19 +02:00
parent f11fcf7ca1
commit 4104b5990c
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java
View File

@ -62,20 +62,17 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
JSONArray results = json.getJSONArray("results"); JSONArray results = json.getJSONArray("results");
for (int i = 0; i < results.length(); i++) { for (int i = 0; i < results.length(); i++) {
JSONObject result = results.getJSONObject(i); JSONObject result = results.getJSONObject(i);
try {
if(result.has("tpl")) { if(result.has("tpl")) {
JSONArray tpl = result.getJSONArray("tpl"); JSONArray tpl = result.getJSONArray("tpl");
String name = tpl.getString(getTemplateIndex(template, "username")); String name = tpl.getString(getTemplateIndex(template, "username"));
String displayName = tpl.getString(getTemplateIndex(template, "display_name")); String displayName = tpl.getString(getTemplateIndex(template, "display_name"));
// int connections = tpl.getInt(2); // int connections = tpl.getInt(2);
String streamName = tpl.getString(getTemplateIndex(template, "stream_name")); String streamName = tpl.getString(getTemplateIndex(template, "stream_name"));
String tsize = tpl.getString(getTemplateIndex(template, "tsize"));
String serverPrefix = tpl.getString(getTemplateIndex(template, "server_prefix"));
CamsodaModel model = (CamsodaModel) camsoda.createModel(name); CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
model.setDescription(tpl.getString(getTemplateIndex(template, "subject_html"))); model.setDescription(tpl.getString(getTemplateIndex(template, "subject_html")));
model.setSortOrder(tpl.getFloat(getTemplateIndex(template, "sort_value"))); model.setSortOrder(tpl.getFloat(getTemplateIndex(template, "sort_value")));
long unixtime = System.currentTimeMillis() / 1000; String preview = "https:" + tpl.getString(getTemplateIndex(template, "thumb"));
String preview = "https://thumbs-orig.camsoda.com/thumbs/"
+ streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime;
model.setPreview(preview); model.setPreview(preview);
JSONArray edgeServers = tpl.getJSONArray(getTemplateIndex(template, "edge_servers")); JSONArray edgeServers = tpl.getJSONArray(getTemplateIndex(template, "edge_servers"));
model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8"); model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
@ -105,6 +102,9 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
model.setPreview(previewUrl); model.setPreview(previewUrl);
} }
} }
} catch (Exception e) {
LOG.warn("Couldn't parse one of the models: {}", result.toString(), e);
}
} }
return models.stream() return models.stream()
.sorted((m1,m2) -> (int)(m2.getSortOrder() - m1.getSortOrder())) .sorted((m1,m2) -> (int)(m2.getSortOrder() - m1.getSortOrder()))