Improve error handling in downloads
This commit is contained in:
parent
c774a29421
commit
c2901284ef
|
@ -81,6 +81,7 @@ public class DashDownload extends AbstractDownload {
|
||||||
.header("Connection", "keep-alive")
|
.header("Connection", "keep-alive")
|
||||||
.build(); // @formatter:on
|
.build(); // @formatter:on
|
||||||
LOG.trace("Loading manifest {}", url);
|
LOG.trace("Loading manifest {}", url);
|
||||||
|
// TODO try 10 times
|
||||||
try (Response response = httpClient.execute(request)) {
|
try (Response response = httpClient.execute(request)) {
|
||||||
if (response.isSuccessful()) {
|
if (response.isSuccessful()) {
|
||||||
return response.body().string();
|
return response.body().string();
|
||||||
|
@ -224,6 +225,7 @@ public class DashDownload extends AbstractDownload {
|
||||||
@Override
|
@Override
|
||||||
public void start() throws IOException {
|
public void start() throws IOException {
|
||||||
try {
|
try {
|
||||||
|
Thread.currentThread().setName("Download " + model.getName());
|
||||||
running = true;
|
running = true;
|
||||||
splitRecStartTime = ZonedDateTime.now();
|
splitRecStartTime = ZonedDateTime.now();
|
||||||
JAXBContext jc = JAXBContext.newInstance(MPDtype.class.getPackage().getName());
|
JAXBContext jc = JAXBContext.newInstance(MPDtype.class.getPackage().getName());
|
||||||
|
@ -237,6 +239,16 @@ public class DashDownload extends AbstractDownload {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} catch(HttpException e) {
|
||||||
|
if(e.getResponseCode() == 404) {
|
||||||
|
LOG.debug("Manifest not found (404). Model {} probably went offline", model);
|
||||||
|
waitSomeTime(10_000);
|
||||||
|
} else if(e.getResponseCode() == 403) {
|
||||||
|
LOG.debug("Manifest access forbidden (403). Model {} probably went private or offline", model);
|
||||||
|
waitSomeTime(10_000);
|
||||||
|
} else {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.error("Error while downloading dash stream", e);
|
LOG.error("Error while downloading dash stream", e);
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -349,6 +361,7 @@ public class DashDownload extends AbstractDownload {
|
||||||
@Override
|
@Override
|
||||||
public void postprocess(Recording recording) {
|
public void postprocess(Recording recording) {
|
||||||
try {
|
try {
|
||||||
|
Thread.currentThread().setName("PP " + model.getName());
|
||||||
recording.setStatus(POST_PROCESSING);
|
recording.setStatus(POST_PROCESSING);
|
||||||
String path = recording.getPath();
|
String path = recording.getPath();
|
||||||
File dir = new File(Config.getInstance().getSettings().recordingsDir, path);
|
File dir = new File(Config.getInstance().getSettings().recordingsDir, path);
|
||||||
|
|
|
@ -38,6 +38,7 @@ import ctbrec.Recording.State;
|
||||||
import ctbrec.UnknownModel;
|
import ctbrec.UnknownModel;
|
||||||
import ctbrec.io.HttpClient;
|
import ctbrec.io.HttpClient;
|
||||||
import ctbrec.io.HttpException;
|
import ctbrec.io.HttpException;
|
||||||
|
import ctbrec.recorder.PlaylistGenerator.InvalidPlaylistException;
|
||||||
import ctbrec.recorder.download.AbstractDownload;
|
import ctbrec.recorder.download.AbstractDownload;
|
||||||
import ctbrec.recorder.download.StreamSource;
|
import ctbrec.recorder.download.StreamSource;
|
||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
|
@ -69,7 +70,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
protected SegmentPlaylist getNextSegments(String segmentsURL) throws IOException, ParseException, PlaylistException {
|
protected SegmentPlaylist getNextSegments(String segmentsURL) throws Exception {
|
||||||
URL segmentsUrl = new URL(segmentsURL);
|
URL segmentsUrl = new URL(segmentsURL);
|
||||||
Request request = new Request.Builder()
|
Request request = new Request.Builder()
|
||||||
.url(segmentsUrl)
|
.url(segmentsUrl)
|
||||||
|
@ -80,10 +81,13 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
.header("Referer", model.getSite().getBaseUrl())
|
.header("Referer", model.getSite().getBaseUrl())
|
||||||
.header("Connection", "keep-alive")
|
.header("Connection", "keep-alive")
|
||||||
.build();
|
.build();
|
||||||
try(Response response = client.execute(request)) {
|
int tries = 1;
|
||||||
if(response.isSuccessful()) {
|
Exception lastException = null;
|
||||||
|
for (int i = 0; i <= 10; i++) {
|
||||||
|
try (Response response = client.execute(request)) {
|
||||||
|
if (response.isSuccessful()) {
|
||||||
String body = response.body().string();
|
String body = response.body().string();
|
||||||
if(!body.contains("#EXTINF")) {
|
if (!body.contains("#EXTINF")) {
|
||||||
// no segments, empty playlist
|
// no segments, empty playlist
|
||||||
return new SegmentPlaylist(segmentsURL);
|
return new SegmentPlaylist(segmentsURL);
|
||||||
}
|
}
|
||||||
|
@ -91,7 +95,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
InputStream inputStream = new ByteArrayInputStream(body.getBytes("utf-8"));
|
InputStream inputStream = new ByteArrayInputStream(body.getBytes("utf-8"));
|
||||||
PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8, ParsingMode.LENIENT);
|
PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8, ParsingMode.LENIENT);
|
||||||
Playlist playlist = parser.parse();
|
Playlist playlist = parser.parse();
|
||||||
if(playlist.hasMediaPlaylist()) {
|
if (playlist.hasMediaPlaylist()) {
|
||||||
MediaPlaylist mediaPlaylist = playlist.getMediaPlaylist();
|
MediaPlaylist mediaPlaylist = playlist.getMediaPlaylist();
|
||||||
SegmentPlaylist lsp = new SegmentPlaylist(segmentsURL);
|
SegmentPlaylist lsp = new SegmentPlaylist(segmentsURL);
|
||||||
lsp.seq = mediaPlaylist.getMediaSequenceNumber();
|
lsp.seq = mediaPlaylist.getMediaSequenceNumber();
|
||||||
|
@ -99,7 +103,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
List<TrackData> tracks = mediaPlaylist.getTracks();
|
List<TrackData> tracks = mediaPlaylist.getTracks();
|
||||||
for (TrackData trackData : tracks) {
|
for (TrackData trackData : tracks) {
|
||||||
String uri = trackData.getUri();
|
String uri = trackData.getUri();
|
||||||
if(!uri.startsWith("http")) {
|
if (!uri.startsWith("http")) {
|
||||||
String tmpurl = segmentsUrl.toString();
|
String tmpurl = segmentsUrl.toString();
|
||||||
tmpurl = tmpurl.substring(0, tmpurl.lastIndexOf('/') + 1);
|
tmpurl = tmpurl.substring(0, tmpurl.lastIndexOf('/') + 1);
|
||||||
uri = tmpurl + uri;
|
uri = tmpurl + uri;
|
||||||
|
@ -107,7 +111,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
lsp.totalDuration += trackData.getTrackInfo().duration;
|
lsp.totalDuration += trackData.getTrackInfo().duration;
|
||||||
lsp.lastSegDuration = trackData.getTrackInfo().duration;
|
lsp.lastSegDuration = trackData.getTrackInfo().duration;
|
||||||
lsp.segments.add(uri);
|
lsp.segments.add(uri);
|
||||||
if(trackData.hasEncryptionData()) {
|
if (trackData.hasEncryptionData()) {
|
||||||
lsp.encrypted = true;
|
lsp.encrypted = true;
|
||||||
EncryptionData data = trackData.getEncryptionData();
|
EncryptionData data = trackData.getEncryptionData();
|
||||||
lsp.encryptionKeyUrl = data.getUri();
|
lsp.encryptionKeyUrl = data.getUri();
|
||||||
|
@ -116,10 +120,20 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
}
|
}
|
||||||
return lsp;
|
return lsp;
|
||||||
}
|
}
|
||||||
return null;
|
throw new InvalidPlaylistException("Playlist has no media playlist");
|
||||||
} else {
|
} else {
|
||||||
throw new HttpException(response.code(), response.message());
|
throw new HttpException(response.code(), response.message());
|
||||||
}
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOG.debug("Couldn't download HLS playlist (try {}) {} - {}", tries, segmentsURL, e.getMessage());
|
||||||
|
lastException = e;
|
||||||
|
}
|
||||||
|
waitSomeTime(100 * tries);
|
||||||
|
}
|
||||||
|
if (lastException != null) {
|
||||||
|
throw lastException;
|
||||||
|
} else {
|
||||||
|
throw new IOException("Couldn't download HLS playlist");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,7 +197,21 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Causes the current thread to sleep for a short amount of time.
|
||||||
|
* This is used to slow down retries, if something is wrong with the playlist.
|
||||||
|
* E.g. HTTP 403 or 404
|
||||||
|
*/
|
||||||
|
protected void waitSomeTime(long waitForMillis) {
|
||||||
|
try {
|
||||||
|
Thread.sleep(waitForMillis);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
if(running) {
|
||||||
|
LOG.error("Couldn't sleep. This might mess up the download!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static class SegmentPlaylist {
|
public static class SegmentPlaylist {
|
||||||
public String url;
|
public String url;
|
||||||
|
|
|
@ -78,30 +78,32 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
public void start() throws IOException {
|
public void start() throws IOException {
|
||||||
try {
|
try {
|
||||||
running = true;
|
running = true;
|
||||||
|
Thread.currentThread().setName("Download " + model.getName());
|
||||||
splitRecStartTime = ZonedDateTime.now();
|
splitRecStartTime = ZonedDateTime.now();
|
||||||
|
|
||||||
if(!model.isOnline()) {
|
if (!model.isOnline()) {
|
||||||
throw new IOException(model.getName() +"'s room is not public");
|
throw new IOException(model.getName() + "'s room is not public");
|
||||||
}
|
}
|
||||||
|
|
||||||
String segments = getSegmentPlaylistUrl(model);
|
String segments = getSegmentPlaylistUrl(model);
|
||||||
if(segments != null) {
|
if (segments != null) {
|
||||||
if (!downloadDir.toFile().exists()) {
|
if (!downloadDir.toFile().exists()) {
|
||||||
Files.createDirectories(downloadDir);
|
Files.createDirectories(downloadDir);
|
||||||
}
|
}
|
||||||
int lastSegmentNumber = 0;
|
int lastSegmentNumber = 0;
|
||||||
int nextSegmentNumber = 0;
|
int nextSegmentNumber = 0;
|
||||||
int waitFactor = 1;
|
int waitFactor = 1;
|
||||||
while(running) {
|
while (running) {
|
||||||
SegmentPlaylist playlist = getNextSegments(segments);
|
SegmentPlaylist playlist = getNextSegments(segments);
|
||||||
emptyPlaylistCheck(playlist);
|
emptyPlaylistCheck(playlist);
|
||||||
if(nextSegmentNumber > 0 && playlist.seq > nextSegmentNumber) {
|
if (nextSegmentNumber > 0 && playlist.seq > nextSegmentNumber) {
|
||||||
waitFactor *= 2;
|
waitFactor *= 2;
|
||||||
LOG.warn("Missed segments {} < {} in download for {} - setting wait factor to 1/{}", nextSegmentNumber, playlist.seq, model, waitFactor);
|
LOG.warn("Missed segments {} < {} in download for {} - setting wait factor to 1/{}", nextSegmentNumber, playlist.seq, model,
|
||||||
|
waitFactor);
|
||||||
}
|
}
|
||||||
int skip = nextSegmentNumber - playlist.seq;
|
int skip = nextSegmentNumber - playlist.seq;
|
||||||
for (String segment : playlist.segments) {
|
for (String segment : playlist.segments) {
|
||||||
if(skip > 0) {
|
if (skip > 0) {
|
||||||
skip--;
|
skip--;
|
||||||
} else {
|
} else {
|
||||||
URL segmentUrl = new URL(segment);
|
URL segmentUrl = new URL(segment);
|
||||||
|
@ -118,7 +120,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
}
|
}
|
||||||
|
|
||||||
long waitForMillis = 0;
|
long waitForMillis = 0;
|
||||||
if(lastSegmentNumber == playlist.seq) {
|
if (lastSegmentNumber == playlist.seq) {
|
||||||
// playlist didn't change -> wait for at least half the target duration
|
// playlist didn't change -> wait for at least half the target duration
|
||||||
waitForMillis = (long) playlist.targetDuration * 1000 / waitFactor;
|
waitForMillis = (long) playlist.targetDuration * 1000 / waitFactor;
|
||||||
LOG.trace("Playlist didn't change... waiting for {}ms", waitForMillis);
|
LOG.trace("Playlist didn't change... waiting for {}ms", waitForMillis);
|
||||||
|
@ -133,31 +135,31 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
// this if check makes sure, that we don't decrease nextSegment. for some reason
|
// this if check makes sure, that we don't decrease nextSegment. for some reason
|
||||||
// streamate playlists sometimes jump back. e.g. max sequence = 79 -> 80 -> 79
|
// streamate playlists sometimes jump back. e.g. max sequence = 79 -> 80 -> 79
|
||||||
lastSegmentNumber = playlist.seq;
|
lastSegmentNumber = playlist.seq;
|
||||||
if(lastSegmentNumber + playlist.segments.size() > nextSegmentNumber) {
|
if (lastSegmentNumber + playlist.segments.size() > nextSegmentNumber) {
|
||||||
nextSegmentNumber = lastSegmentNumber + playlist.segments.size();
|
nextSegmentNumber = lastSegmentNumber + playlist.segments.size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new IOException("Couldn't determine segments uri");
|
throw new IOException("Couldn't determine segments uri");
|
||||||
}
|
}
|
||||||
} catch(ParseException e) {
|
} catch (ParseException e) {
|
||||||
throw new IOException("Couldn't parse HLS playlist:\n" + e.getInput(), e);
|
throw new IOException("Couldn't parse HLS playlist:\n" + e.getInput(), e);
|
||||||
} catch(PlaylistException e) {
|
} catch (PlaylistException e) {
|
||||||
throw new IOException("Couldn't parse HLS playlist", e);
|
throw new IOException("Couldn't parse HLS playlist", e);
|
||||||
} catch(EOFException e) {
|
} catch (EOFException e) {
|
||||||
// end of playlist reached
|
// end of playlist reached
|
||||||
LOG.debug("Reached end of playlist for model {}", model);
|
LOG.debug("Reached end of playlist for model {}", model);
|
||||||
} catch(HttpException e) {
|
} catch (HttpException e) {
|
||||||
if(e.getResponseCode() == 404) {
|
if (e.getResponseCode() == 404) {
|
||||||
LOG.debug("Playlist not found (404). Model {} probably went offline", model);
|
LOG.debug("Playlist not found (404). Model {} probably went offline", model);
|
||||||
waitSomeTime(10_000);
|
waitSomeTime(10_000);
|
||||||
} else if(e.getResponseCode() == 403) {
|
} else if (e.getResponseCode() == 403) {
|
||||||
LOG.debug("Playlist access forbidden (403). Model {} probably went private or offline", model);
|
LOG.debug("Playlist access forbidden (403). Model {} probably went private or offline", model);
|
||||||
waitSomeTime(10_000);
|
waitSomeTime(10_000);
|
||||||
} else {
|
} else {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
throw new IOException("Couldn't download segment", e);
|
throw new IOException("Couldn't download segment", e);
|
||||||
} finally {
|
} finally {
|
||||||
downloadThreadPool.shutdown();
|
downloadThreadPool.shutdown();
|
||||||
|
@ -176,6 +178,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void postprocess(Recording recording) {
|
public void postprocess(Recording recording) {
|
||||||
|
Thread.currentThread().setName("PP " + model.getName());
|
||||||
recording.setStatusWithEvent(State.GENERATING_PLAYLIST);
|
recording.setStatusWithEvent(State.GENERATING_PLAYLIST);
|
||||||
generatePlaylist(recording);
|
generatePlaylist(recording);
|
||||||
recording.setStatusWithEvent(State.POST_PROCESSING);
|
recording.setStatusWithEvent(State.POST_PROCESSING);
|
||||||
|
@ -188,7 +191,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
|
|
||||||
protected File generatePlaylist(Recording recording) {
|
protected File generatePlaylist(Recording recording) {
|
||||||
File recDir = recording.getAbsoluteFile();
|
File recDir = recording.getAbsoluteFile();
|
||||||
if(!config.getSettings().generatePlaylist) {
|
if (!config.getSettings().generatePlaylist) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,7 +200,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
File playlist = playlistGenerator.generate(recDir);
|
File playlist = playlistGenerator.generate(recDir);
|
||||||
if(playlist != null) {
|
if (playlist != null) {
|
||||||
playlistGenerator.validate(recDir);
|
playlistGenerator.validate(recDir);
|
||||||
}
|
}
|
||||||
recording.setProgress(-1);
|
recording.setProgress(-1);
|
||||||
|
@ -205,7 +208,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
} catch (IOException | ParseException e) {
|
} catch (IOException | ParseException e) {
|
||||||
LOG.error("Couldn't generate playlist file", e);
|
LOG.error("Couldn't generate playlist file", e);
|
||||||
} catch (PlaylistException e) {
|
} catch (PlaylistException e) {
|
||||||
if(e.getErrors().isEmpty()) {
|
if (e.getErrors().isEmpty()) {
|
||||||
LOG.error("Couldn't generate playlist file", e);
|
LOG.error("Couldn't generate playlist file", e);
|
||||||
} else {
|
} else {
|
||||||
LOG.error("Playlist contains errors");
|
LOG.error("Playlist contains errors");
|
||||||
|
@ -217,7 +220,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
LOG.error("Playlist is invalid and will be deleted", e);
|
LOG.error("Playlist is invalid and will be deleted", e);
|
||||||
File playlist = new File(recDir, "playlist.m3u8");
|
File playlist = new File(recDir, "playlist.m3u8");
|
||||||
try {
|
try {
|
||||||
Files.delete(playlist.toPath());
|
Files.deleteIfExists(playlist.toPath());
|
||||||
} catch (IOException e1) {
|
} catch (IOException e1) {
|
||||||
LOG.error("Couldn't delete playlist {}", playlist, e1);
|
LOG.error("Couldn't delete playlist {}", playlist, e1);
|
||||||
}
|
}
|
||||||
|
@ -227,10 +230,10 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean splitRecording() {
|
private boolean splitRecording() {
|
||||||
if(config.getSettings().splitRecordings > 0) {
|
if (config.getSettings().splitRecordings > 0) {
|
||||||
Duration recordingDuration = Duration.between(splitRecStartTime, ZonedDateTime.now());
|
Duration recordingDuration = Duration.between(splitRecStartTime, ZonedDateTime.now());
|
||||||
long seconds = recordingDuration.getSeconds();
|
long seconds = recordingDuration.getSeconds();
|
||||||
if(seconds >= config.getSettings().splitRecordings) {
|
if (seconds >= config.getSettings().splitRecordings) {
|
||||||
internalStop();
|
internalStop();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -275,36 +278,41 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
@Override
|
@Override
|
||||||
public Boolean call() throws Exception {
|
public Boolean call() throws Exception {
|
||||||
LOG.trace("Downloading segment to {}", file);
|
LOG.trace("Downloading segment to {}", file);
|
||||||
int maxTries = 3;
|
int maxTries = 5;
|
||||||
for (int i = 1; i <= maxTries; i++) {
|
for (int i = 1; i <= maxTries; i++) {
|
||||||
Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build();
|
Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build();
|
||||||
Response response = client.execute(request);
|
try (Response response = client.execute(request)) {
|
||||||
|
if (response.isSuccessful()) {
|
||||||
InputStream in = null;
|
InputStream in = null;
|
||||||
try (FileOutputStream fos = new FileOutputStream(file.toFile())) {
|
try (FileOutputStream fos = new FileOutputStream(file.toFile())) {
|
||||||
in = response.body().byteStream();
|
in = response.body().byteStream();
|
||||||
if(playlist.encrypted) {
|
if (playlist.encrypted) {
|
||||||
in = new Crypto(playlist.encryptionKeyUrl, client).wrap(in);
|
in = new Crypto(playlist.encryptionKeyUrl, client).wrap(in);
|
||||||
}
|
}
|
||||||
byte[] b = new byte[1024 * 100];
|
byte[] b = new byte[1024 * 100];
|
||||||
int length = -1;
|
int length = -1;
|
||||||
while( (length = in.read(b)) >= 0 ) {
|
while ((length = in.read(b)) >= 0) {
|
||||||
fos.write(b, 0, length);
|
fos.write(b, 0, length);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
} catch(FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
LOG.debug("Segment does not exist {}", url.getFile());
|
LOG.debug("Segment does not exist {}", url.getFile());
|
||||||
break;
|
break;
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
if (i == maxTries) {
|
if (i == maxTries) {
|
||||||
LOG.warn("Error while downloading segment. Segment {} finally failed", file.toFile().getName());
|
LOG.warn("Error while downloading segment. Segment {} finally failed", file.toFile().getName());
|
||||||
} else {
|
} else {
|
||||||
LOG.warn("Error while downloading segment on try {}", i);
|
LOG.warn("Error while downloading segment on try {}", i);
|
||||||
}
|
}
|
||||||
} finally {
|
|
||||||
if(in != null) {
|
|
||||||
in.close();
|
|
||||||
}
|
}
|
||||||
response.close();
|
} else {
|
||||||
|
// wait a bit and retry
|
||||||
|
try {
|
||||||
|
Thread.sleep(50 * i);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -339,7 +347,7 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
|
|
||||||
private double getPlaylistLength(File playlist) throws IOException, ParseException, PlaylistException {
|
private double getPlaylistLength(File playlist) throws IOException, ParseException, PlaylistException {
|
||||||
if (playlist.exists()) {
|
if (playlist.exists()) {
|
||||||
try(FileInputStream fin = new FileInputStream(playlist)) {
|
try (FileInputStream fin = new FileInputStream(playlist)) {
|
||||||
PlaylistParser playlistParser = new PlaylistParser(fin, Format.EXT_M3U, Encoding.UTF_8, ParsingMode.LENIENT);
|
PlaylistParser playlistParser = new PlaylistParser(fin, Format.EXT_M3U, Encoding.UTF_8, ParsingMode.LENIENT);
|
||||||
Playlist m3u = playlistParser.parse();
|
Playlist m3u = playlistParser.parse();
|
||||||
MediaPlaylist mediaPlaylist = m3u.getMediaPlaylist();
|
MediaPlaylist mediaPlaylist = m3u.getMediaPlaylist();
|
||||||
|
@ -353,20 +361,4 @@ public class HlsDownload extends AbstractHlsDownload {
|
||||||
throw new FileNotFoundException(playlist.getAbsolutePath() + " does not exist");
|
throw new FileNotFoundException(playlist.getAbsolutePath() + " does not exist");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Causes the current thread to sleep for a short amount of time.
|
|
||||||
* This is used to slow down retries, if something is wrong with the playlist.
|
|
||||||
* E.g. HTTP 403 or 404
|
|
||||||
*/
|
|
||||||
private void waitSomeTime(long waitForMillis) {
|
|
||||||
try {
|
|
||||||
Thread.sleep(waitForMillis);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
if(running) {
|
|
||||||
LOG.error("Couldn't sleep. This might mess up the download!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,6 @@ import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.security.InvalidKeyException;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -18,9 +16,6 @@ import org.jcodec.containers.mp4.boxes.MovieBox;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.iheartradio.m3u8.ParseException;
|
|
||||||
import com.iheartradio.m3u8.PlaylistException;
|
|
||||||
|
|
||||||
import ctbrec.Config;
|
import ctbrec.Config;
|
||||||
import ctbrec.Hmac;
|
import ctbrec.Hmac;
|
||||||
import ctbrec.Model;
|
import ctbrec.Model;
|
||||||
|
@ -56,6 +51,7 @@ public class MergedHlsDownload extends HlsDownload {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void postprocess(ctbrec.Recording recording) {
|
public void postprocess(ctbrec.Recording recording) {
|
||||||
|
Thread.currentThread().setName("PP " + model.getName());
|
||||||
try {
|
try {
|
||||||
File playlist = super.generatePlaylist(recording);
|
File playlist = super.generatePlaylist(recording);
|
||||||
Objects.requireNonNull(playlist, "Generated playlist is null");
|
Objects.requireNonNull(playlist, "Generated playlist is null");
|
||||||
|
@ -110,7 +106,7 @@ public class MergedHlsDownload extends HlsDownload {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void downloadFinishedRecording(String segmentPlaylistUri, File target, ProgressListener progressListener)
|
public void downloadFinishedRecording(String segmentPlaylistUri, File target, ProgressListener progressListener)
|
||||||
throws IOException, ParseException, PlaylistException, InvalidKeyException, NoSuchAlgorithmException {
|
throws Exception {
|
||||||
if (Config.getInstance().getSettings().requireAuthentication) {
|
if (Config.getInstance().getSettings().requireAuthentication) {
|
||||||
URL u = new URL(segmentPlaylistUri);
|
URL u = new URL(segmentPlaylistUri);
|
||||||
String path = u.getPath();
|
String path = u.getPath();
|
||||||
|
|
|
@ -17,7 +17,7 @@ import ctbrec.recorder.download.hls.HlsDownload;
|
||||||
|
|
||||||
public class LiveJasminHlsDownload extends HlsDownload {
|
public class LiveJasminHlsDownload extends HlsDownload {
|
||||||
|
|
||||||
private static final transient Logger LOG = LoggerFactory.getLogger(LiveJasminHlsDownload.class);
|
private static final Logger LOG = LoggerFactory.getLogger(LiveJasminHlsDownload.class);
|
||||||
private long lastMasterPlaylistUpdate = 0;
|
private long lastMasterPlaylistUpdate = 0;
|
||||||
private String segmentUrl;
|
private String segmentUrl;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ public class LiveJasminHlsDownload extends HlsDownload {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SegmentPlaylist getNextSegments(String segments) throws IOException, ParseException, PlaylistException {
|
protected SegmentPlaylist getNextSegments(String segments) throws Exception {
|
||||||
if(this.segmentUrl == null) {
|
if(this.segmentUrl == null) {
|
||||||
this.segmentUrl = segments;
|
this.segmentUrl = segments;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import ctbrec.recorder.download.hls.MergedHlsDownload;
|
||||||
|
|
||||||
public class LiveJasminMergedHlsDownload extends MergedHlsDownload {
|
public class LiveJasminMergedHlsDownload extends MergedHlsDownload {
|
||||||
|
|
||||||
private static final transient Logger LOG = LoggerFactory.getLogger(LiveJasminMergedHlsDownload.class);
|
private static final Logger LOG = LoggerFactory.getLogger(LiveJasminMergedHlsDownload.class);
|
||||||
private long lastMasterPlaylistUpdate = 0;
|
private long lastMasterPlaylistUpdate = 0;
|
||||||
private String segmentUrl;
|
private String segmentUrl;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ public class LiveJasminMergedHlsDownload extends MergedHlsDownload {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SegmentPlaylist getNextSegments(String segments) throws IOException, ParseException, PlaylistException {
|
protected SegmentPlaylist getNextSegments(String segments) throws Exception {
|
||||||
if(this.segmentUrl == null) {
|
if(this.segmentUrl == null) {
|
||||||
this.segmentUrl = segments;
|
this.segmentUrl = segments;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue