jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix problem with Cam4 edge URLs 

The edge URLs are already abosulte, so the base URL does not have to be
prepended
This commit is contained in:
0xb00bface 2021-01-12 20:42:08 +01:00
parent df37f4a61c
commit 3d4bd6f331
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
3.12.2
========================
* Fix: Some Cam4 URLs where broken
3.12.1 3.12.1
======================== ========================
* Fix: "Resume all" started the recordings of models marked for later recording * Fix: "Resume all" started the recordings of models marked for later recording

10
common/src/main/java/ctbrec/sites/cam4/Cam4Model.java
View File

@ -191,9 +191,13 @@ public class Cam4Model extends AbstractModel {
StreamSource src = new StreamSource(); StreamSource src = new StreamSource();
src.bandwidth = playlist.getStreamInfo().getBandwidth(); src.bandwidth = playlist.getStreamInfo().getBandwidth();
src.height = Optional.ofNullable(playlist.getStreamInfo()).map(StreamInfo::getResolution).map(res -> res.height).orElse(0); src.height = Optional.ofNullable(playlist.getStreamInfo()).map(StreamInfo::getResolution).map(res -> res.height).orElse(0);
String masterUrl = getPlaylistUrl(); if (playlist.getUri().startsWith("http")) {
String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1); src.mediaPlaylistUrl = playlist.getUri();
src.mediaPlaylistUrl = baseUrl + playlist.getUri(); } else {
String masterUrl = getPlaylistUrl();
String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1);
src.mediaPlaylistUrl = baseUrl + playlist.getUri();
}
LOG.trace("Media playlist {}", src.mediaPlaylistUrl); LOG.trace("Media playlist {}", src.mediaPlaylistUrl);
sources.add(src); sources.add(src);
} }