davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix model parsing 

JSON structure seems to have changed slightly
This commit is contained in:
0xboobface 2018-11-02 18:13:40 +01:00
parent 6faee8290c
commit cbc4a5e339
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/ctbrec/sites/camsoda/CamsodaUpdateService.java
View File

@ -59,26 +59,37 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
String streamName = tpl.getString(5); String streamName = tpl.getString(5);
String tsize = tpl.getString(6); String tsize = tpl.getString(6);
String serverPrefix = tpl.getString(7); String serverPrefix = tpl.getString(7);
JSONArray edgeServers = result.getJSONArray("edge_servers");
CamsodaModel model = (CamsodaModel) camsoda.createModel(name); CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
model.setDescription(tpl.getString(4)); model.setDescription(tpl.getString(4));
model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
model.setSortOrder(tpl.getFloat(3)); model.setSortOrder(tpl.getFloat(3));
long unixtime = System.currentTimeMillis() / 1000; long unixtime = System.currentTimeMillis() / 1000;
String preview = "https://thumbs-orig.camsoda.com/thumbs/" String preview = "https://thumbs-orig.camsoda.com/thumbs/"
+ streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime; + streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime;
model.setPreview(preview); model.setPreview(preview);
if(result.has("edge_servers")) {
JSONArray edgeServers = result.getJSONArray("edge_servers");
model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
}
models.add(model); models.add(model);
} else { } else {
//LOG.debug("{}", result.toString(2)); //LOG.debug("{}", result.toString(2));
String name = result.getString("username"); String name = result.getString("username");
CamsodaModel model = (CamsodaModel) camsoda.createModel(name); CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
if(result.has("server_prefix")) { if(result.has("server_prefix")) {
String serverPrefix = result.getString("server_prefix"); String serverPrefix = result.getString("server_prefix");
String streamName = result.getString("stream_name"); String streamName = result.getString("stream_name");
model.setSortOrder(result.getFloat("sort_value"));
models.add(model);
if(result.has("status")) {
model.setOnlineState(result.getString("status"));
}
if(result.has("edge_servers")) {
JSONArray edgeServers = result.getJSONArray("edge_servers"); JSONArray edgeServers = result.getJSONArray("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");
}
if(result.has("tsize")) { if(result.has("tsize")) {
long unixtime = System.currentTimeMillis() / 1000; long unixtime = System.currentTimeMillis() / 1000;
@ -88,11 +99,6 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
model.setPreview(preview); model.setPreview(preview);
} }
model.setSortOrder(result.getFloat("sort_value"));
models.add(model);
if(result.has("status")) {
model.setOnlineState(result.getString("status"));
}
} }
} }
} }