j62
/
ctbrec
2
2
Fork 2
Code Issues 4 Pull Requests Packages Projects Releases 3 Wiki Activity

Sort by camsoda sort value

This commit is contained in:
0xboobface 2018-10-26 01:23:07 +02:00
parent e940a81d41
commit 60494a09fd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ public class CamsodaModel extends AbstractModel {
private List<StreamSource> streamSources = null;
private int[] resolution;
private String status = "n/a";
private float sortOrder = 0;
public String getStreamUrl() throws IOException {
if(streamUrl == null) {
@ -172,4 +173,11 @@ public class CamsodaModel extends AbstractModel {
this.streamUrl = streamUrl;
}
public float getSortOrder() {
return sortOrder;
}
public void setSortOrder(float sortOrder) {
this.sortOrder = sortOrder;
}
}

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

@ -2,6 +2,7 @@ package ctbrec.sites.camsoda;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -37,9 +38,9 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
return new Task<List<Model>>() {
@Override
public List<Model> call() throws IOException {
List<Model> models = new ArrayList<>();
List<CamsodaModel> models = new ArrayList<>();
if(loginRequired && StringUtil.isBlank(ctbrec.Config.getInstance().getSettings().username)) {
return models;
return Collections.emptyList();
} else {
String url = CamsodaUpdateService.this.url;
LOG.debug("Fetching page {}", url);
@ -55,7 +56,6 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
JSONArray tpl = result.getJSONArray("tpl");
String name = tpl.getString(0);
// int connections = tpl.getInt(2);
// float sortValue = tpl.getFloat(3);
String streamName = tpl.getString(5);
String tsize = tpl.getString(6);
String serverPrefix = tpl.getString(7);
@ -63,6 +63,7 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
model.setDescription(tpl.getString(4));
model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
model.setSortOrder(tpl.getFloat(3));
long unixtime = System.currentTimeMillis() / 1000;
String preview = "https://thumbs-orig.camsoda.com/thumbs/"
+ streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime;
@ -77,12 +78,13 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
}
}
return models.stream()
.sorted((m1,m2) -> (int)(m2.getSortOrder() - m1.getSortOrder()))
.skip( (page-1) * modelsPerPage)
.limit(modelsPerPage)
.collect(Collectors.toList());
} else {
response.close();
return models;
return Collections.emptyList();
}
} else {
int code = response.code();