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

Merge branch 'master' into dev

This commit is contained in:
0xboobface 2018-09-25 15:02:00 +02:00
parent b206a6caf7 cccb23906d
commit ab9f3c7df1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ctbrec/recorder/LocalRecorder.java
View File

@ -532,7 +532,7 @@ public class LocalRecorder implements Recorder {
boolean deletedAllFiles = true; boolean deletedAllFiles = true;
for (File file : files) { for (File file : files) {
try { try {
LOG.debug("Deleting {}", file.getAbsolutePath()); LOG.trace("Deleting {}", file.getAbsolutePath());
Files.delete(file.toPath()); Files.delete(file.toPath());
} catch (Exception e) { } catch (Exception e) {
deletedAllFiles = false; deletedAllFiles = false;
@ -542,9 +542,6 @@ public class LocalRecorder implements Recorder {
if (deletedAllFiles) { if (deletedAllFiles) {
LOG.debug("All files deleted"); LOG.debug("All files deleted");
for (String file : directory.list()) {
LOG.debug(file);
}
if (directory.list().length == 0) { if (directory.list().length == 0) {
LOG.debug("Deleting directory {}", directory); LOG.debug("Deleting directory {}", directory);
boolean deleted = directory.delete(); boolean deleted = directory.delete();

2
src/main/java/ctbrec/recorder/download/HlsDownload.java
View File

@ -109,7 +109,7 @@ public class HlsDownload extends AbstractHlsDownload {
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 stream information", 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) {