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

Add Camsoda to sites in HttpServer

This commit is contained in:
0xboobface 2018-10-26 23:01:17 +02:00
parent a31bad7466
commit d4bff345a1
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ctbrec/recorder/server/HttpServer.java
View File

@ -20,6 +20,7 @@ import ctbrec.Config;
import ctbrec.recorder.LocalRecorder; import ctbrec.recorder.LocalRecorder;
import ctbrec.recorder.Recorder; import ctbrec.recorder.Recorder;
import ctbrec.sites.Site; import ctbrec.sites.Site;
import ctbrec.sites.camsoda.Camsoda;
import ctbrec.sites.chaturbate.Chaturbate; import ctbrec.sites.chaturbate.Chaturbate;
import ctbrec.sites.mfc.MyFreeCams; import ctbrec.sites.mfc.MyFreeCams;
@ -52,7 +53,9 @@ public class HttpServer {
} }
recorder = new LocalRecorder(config); recorder = new LocalRecorder(config);
for (Site site : sites) { for (Site site : sites) {
site.init(); if(site.isEnabled()) {
site.init();
}
} }
startHttpServer(); startHttpServer();
} }
@ -60,6 +63,7 @@ public class HttpServer {
private void createSites() { private void createSites() {
sites.add(new Chaturbate()); sites.add(new Chaturbate());
sites.add(new MyFreeCams()); sites.add(new MyFreeCams());
sites.add(new Camsoda());
} }
private void addShutdownHook() { private void addShutdownHook() {

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

@ -170,7 +170,16 @@ public class CamsodaModel extends AbstractModel {
@Override @Override
public void setSite(Site site) { public void setSite(Site site) {
this.site = site; if(site instanceof Camsoda) {
this.site = site;
} else {
throw new IllegalArgumentException("Site has to be an instance of Camsoda");
}
}
@Override
public Site getSite() {
return site;
} }
public void setStreamUrl(String streamUrl) { public void setStreamUrl(String streamUrl) {

2
src/main/java/ctbrec/sites/camsoda/CamsodaTabProvider.java
View File

@ -24,7 +24,7 @@ public class CamsodaTabProvider extends TabProvider {
@Override @Override
public List<Tab> getTabs(Scene scene) { public List<Tab> getTabs(Scene scene) {
List<Tab> tabs = new ArrayList<>(); List<Tab> tabs = new ArrayList<>();
tabs.add(createTab("Featured", BASE_URI + "/api/v1/browse/online")); tabs.add(createTab("Online", BASE_URI + "/api/v1/browse/online"));
// ChaturbateFollowedTab followedTab = new ChaturbateFollowedTab("Followed", BASE_URI + "/followed-cams/", chaturbate); // ChaturbateFollowedTab followedTab = new ChaturbateFollowedTab("Followed", BASE_URI + "/followed-cams/", chaturbate);
// followedTab.setRecorder(recorder); // followedTab.setRecorder(recorder);
// followedTab.setScene(scene); // followedTab.setScene(scene);

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

@ -70,14 +70,14 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
model.setPreview(preview); model.setPreview(preview);
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);
JSONArray edgeServers = result.getJSONArray("edge_servers");
String streamName = result.getString("stream_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");
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")) {