From c17fe9c17349f79b11267333101f03ad586962a6 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sat, 20 Apr 2019 15:54:54 +0200
Subject: [PATCH 1/2] Fix: Check for empty playlists used the wrong tag
Use #EXTINF to check, if a playlist has entries instead of #EXT-X-STREAM-INF, which was accidentally used.
This tag only occurs in master playlists.
---
.../main/java/ctbrec/recorder/download/AbstractHlsDownload.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
index c6763d24..7b36ee20 100644
--- a/common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
+++ b/common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
@@ -67,7 +67,7 @@ public abstract class AbstractHlsDownload implements Download {
try(Response response = client.execute(request)) {
if(response.isSuccessful()) {
String body = response.body().string();
- if(!body.contains("#EXT-X-STREAM-INF")) {
+ if(!body.contains("#EXTINF")) {
// no segments, empty playlist
return new SegmentPlaylist(segmentsURL);
}
From f4b7141a634f9479eb1e01da87582fbb47a8df6a Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sat, 20 Apr 2019 16:02:09 +0200
Subject: [PATCH 2/2] Increase version to 1.21.1
---
CHANGELOG.md | 2 +-
client/pom.xml | 2 +-
common/pom.xml | 2 +-
master/pom.xml | 2 +-
server/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 951e5a17..ce0bedc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-1.21.0
+1.21.1
========================
* Added support for Flirt4Free
* Live previews don't work
diff --git a/client/pom.xml b/client/pom.xml
index fa4d9b3e..9f8a6e45 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -8,7 +8,7 @@
ctbrec
master
- 1.21.0
+ 1.21.1
../master
diff --git a/common/pom.xml b/common/pom.xml
index 08589f73..a5178768 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -8,7 +8,7 @@
ctbrec
master
- 1.21.0
+ 1.21.1
../master
diff --git a/master/pom.xml b/master/pom.xml
index b0a7a95b..5732eed2 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -6,7 +6,7 @@
ctbrec
master
pom
- 1.21.0
+ 1.21.1
../common
diff --git a/server/pom.xml b/server/pom.xml
index 6869472c..9f166356 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -8,7 +8,7 @@
ctbrec
master
- 1.21.0
+ 1.21.1
../master