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

Merge branch 'master' into dev

This commit is contained in:
0xboobface 2019-04-20 16:06:17 +02:00
parent 133afc2475 f4b7141a63
commit 33c4468d1b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
1.21.0 1.21.1
======================== ========================
* Added support for Flirt4Free * Added support for Flirt4Free
* Live previews don't work * Live previews don't work

2
client/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>ctbrec</groupId> <groupId>ctbrec</groupId>
<artifactId>master</artifactId> <artifactId>master</artifactId>
<version>1.21.0</version> <version>1.21.1</version>
<relativePath>../master</relativePath> <relativePath>../master</relativePath>
</parent> </parent>

2
common/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>ctbrec</groupId> <groupId>ctbrec</groupId>
<artifactId>master</artifactId> <artifactId>master</artifactId>
<version>1.21.0</version> <version>1.21.1</version>
<relativePath>../master</relativePath> <relativePath>../master</relativePath>
</parent> </parent>

2
common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
View File

@ -70,7 +70,7 @@ public abstract class AbstractHlsDownload implements Download {
try(Response response = client.execute(request)) { try(Response response = client.execute(request)) {
if(response.isSuccessful()) { if(response.isSuccessful()) {
String body = response.body().string(); String body = response.body().string();
if(!body.contains("#EXT-X-STREAM-INF")) { if(!body.contains("#EXTINF")) {
// no segments, empty playlist // no segments, empty playlist
return new SegmentPlaylist(segmentsURL); return new SegmentPlaylist(segmentsURL);
} }

2
master/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>ctbrec</groupId> <groupId>ctbrec</groupId>
<artifactId>master</artifactId> <artifactId>master</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.21.0</version> <version>1.21.1</version>
<modules> <modules>
<module>../common</module> <module>../common</module>

2
server/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>ctbrec</groupId> <groupId>ctbrec</groupId>
<artifactId>master</artifactId> <artifactId>master</artifactId>
<version>1.21.0</version> <version>1.21.1</version>
<relativePath>../master</relativePath> <relativePath>../master</relativePath>
</parent> </parent>