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

Adjust CamsodaUpdateService to new JSON structure

This commit is contained in:
0xboobface 2019-01-23 17:40:20 +01:00
parent 44bc5d02aa
commit b548db4a66
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,31 +84,25 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
} else { } else {
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")) { String streamName = result.getString("stream_name");
String serverPrefix = result.getString("server_prefix"); model.setSortOrder(result.getFloat("sort_value"));
String streamName = result.getString("stream_name"); models.add(model);
model.setSortOrder(result.getFloat("sort_value")); if(result.has("status")) {
models.add(model); model.setOnlineStateByStatus(result.getString("status"));
if(result.has("status")) { }
model.setOnlineStateByStatus(result.getString("status"));
}
if(result.has("display_name")) { if(result.has("display_name")) {
model.setDisplayName(result.getString("display_name")); model.setDisplayName(result.getString("display_name"));
} }
if(result.has("edge_servers")) { 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("thumb")) {
long unixtime = System.currentTimeMillis() / 1000; String previewUrl = "https:" + result.getString("thumb");
String tsize = result.getString("tsize"); model.setPreview(previewUrl);
String preview = "https://thumbs-orig.camsoda.com/thumbs/"
+ streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime;
model.setPreview(preview);
}
} }
} }
} }
@ -118,6 +112,7 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
.limit(modelsPerPage) .limit(modelsPerPage)
.collect(Collectors.toList()); .collect(Collectors.toList());
} else { } else {
LOG.debug("Response was not successful: {}", json.toString());
return Collections.emptyList(); return Collections.emptyList();
} }
} else { } else {