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

Added support for display names from Camsoda

This commit is contained in:
0xboobface 2018-12-01 16:34:09 +01:00
parent 56291cb97f
commit f0edfb167c
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,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);
String displayName = tpl.getString(1);
// 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);
@ -77,11 +78,11 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
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");
} }
model.setDisplayName(displayName);
models.add(model); models.add(model);
} 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")) { 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");
@ -91,6 +92,10 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
model.setOnlineState(result.getString("status")); model.setOnlineState(result.getString("status"));
} }
if(result.has("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");

3
common/src/main/java/ctbrec/sites/camsoda/Camsoda.java
View File

@ -140,6 +140,9 @@ public class Camsoda extends AbstractSite {
if(thumb != null) { if(thumb != null) {
model.setPreview("https:" + thumb); model.setPreview("https:" + thumb);
} }
if(result.has("display_name")) {
model.setDisplayName(result.getString("display_name"));
}
models.add(model); models.add(model);
} }
return models; return models;

3
common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
View File

@ -111,6 +111,9 @@ public class ChaturbateModel extends AbstractModel {
String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1); String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1);
String segmentUri = baseUrl + playlist.getUri(); String segmentUri = baseUrl + playlist.getUri();
src.mediaPlaylistUrl = segmentUri; src.mediaPlaylistUrl = segmentUri;
if(src.mediaPlaylistUrl.contains("?")) {
src.mediaPlaylistUrl = src.mediaPlaylistUrl.substring(0, src.mediaPlaylistUrl.lastIndexOf('?'));
}
LOG.trace("Media playlist {}", src.mediaPlaylistUrl); LOG.trace("Media playlist {}", src.mediaPlaylistUrl);
sources.add(src); sources.add(src);
} }