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

Complete json parsing

This commit is contained in:
0xboobface 2018-10-26 01:55:08 +02:00
parent 60494a09fd
commit ebbfacd802
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ctbrec/sites/camsoda/CamsodaModel.java
View File

@ -88,6 +88,10 @@ public class CamsodaModel extends AbstractModel {
} }
} }
public void setOnlineState(String state) {
this.status = state;
}
@Override @Override
public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException { public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException {
LOG.trace("Loading master playlist {}", streamUrl); LOG.trace("Loading master playlist {}", streamUrl);

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

@ -55,7 +55,7 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
if(result.has("tpl")) { if(result.has("tpl")) {
JSONArray tpl = result.getJSONArray("tpl"); JSONArray tpl = result.getJSONArray("tpl");
String name = tpl.getString(0); String name = tpl.getString(0);
// int connections = tpl.getInt(2); // int connections = tpl.getInt(2);
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);
@ -68,13 +68,32 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
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);
//LOG.debug(model.getPreview());
models.add(model); models.add(model);
// https://vide16-ord.camsoda.com/cam/mp4:kipsyrose-enc6-ord_h264_aac_480p/playlist.m3u8
// https://enc42-ord.camsoda.com/cam/mp4:elizasmile-enc42-ord_h264_aac_480p/playlist.m3u8
// https://thumbs-orig.camsoda.com/thumbs/marriednaughtycol-enc35-ord/enc35-ord/340x255/51349794/marriednaughtycol.jpg?cb=51349794
} else { } else {
//LOG.debug("HÖ? {}", result.toString(2)); LOG.debug("{}", result.toString(2));
String name = result.getString("username");
CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
JSONArray edgeServers = result.getJSONArray("edge_servers");
String streamName = result.getString("stream_name");
if(result.has("server_prefix")) {
String serverPrefix = result.getString("server_prefix");
model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
if(result.has("tsize")) {
long unixtime = System.currentTimeMillis() / 1000;
String tsize = result.getString("tsize");
String preview = "https://thumbs-orig.camsoda.com/thumbs/"
+ streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime;
model.setPreview(preview);
}
model.setSortOrder(result.getFloat("sort_value"));
models.add(model);
if(result.has("status")) {
model.setOnlineState(result.getString("status"));
}
}
} }
} }
return models.stream() return models.stream()