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

Improve exception handling and logging for the playlist generation

This commit is contained in:
0xboobface 2019-02-05 13:38:09 +01:00
parent 89f2319345
commit 39679f3162
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/ctbrec/recorder/LocalRecorder.java
View File

@ -41,6 +41,7 @@ import com.iheartradio.m3u8.Encoding;
import com.iheartradio.m3u8.Format; import com.iheartradio.m3u8.Format;
import com.iheartradio.m3u8.ParseException; import com.iheartradio.m3u8.ParseException;
import com.iheartradio.m3u8.ParsingMode; import com.iheartradio.m3u8.ParsingMode;
import com.iheartradio.m3u8.PlaylistError;
import com.iheartradio.m3u8.PlaylistException; import com.iheartradio.m3u8.PlaylistException;
import com.iheartradio.m3u8.PlaylistParser; import com.iheartradio.m3u8.PlaylistParser;
import com.iheartradio.m3u8.data.MediaPlaylist; import com.iheartradio.m3u8.data.MediaPlaylist;
@ -408,8 +409,17 @@ public class LocalRecorder implements Recorder {
if(playlist != null) { if(playlist != null) {
playlistGenerator.validate(recDir); playlistGenerator.validate(recDir);
} }
} catch (IOException | ParseException | PlaylistException e) { } catch (IOException | ParseException e) {
LOG.error("Couldn't generate playlist file", e); LOG.error("Couldn't generate playlist file", e);
} catch (PlaylistException e) {
if(e.getErrors().isEmpty()) {
LOG.error("Couldn't generate playlist file", e);
} else {
LOG.error("Playlist contains errors");
for (PlaylistError error : e.getErrors()) {
LOG.error("Error: {}", error.toString());
}
}
} catch (InvalidPlaylistException e) { } catch (InvalidPlaylistException e) {
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");

13
common/src/main/java/ctbrec/recorder/PlaylistGenerator.java
View File

@ -56,10 +56,15 @@ public class PlaylistGenerator {
int done = 0; int done = 0;
for (File file : files) { for (File file : files) {
try { try {
track.add(new TrackData.Builder() float duration = (float) MpegUtil.getFileDuration(file);
.withUri(file.getName()) if(duration <= 0) {
.withTrackInfo(new TrackInfo((float) MpegUtil.getFileDuration(file), file.getName())) throw new RuntimeException("Track has negative duration: " + file.getName());
.build()); } else {
track.add(new TrackData.Builder()
.withUri(file.getName())
.withTrackInfo(new TrackInfo(duration, file.getName()))
.build());
}
} catch(Exception e) { } catch(Exception e) {
LOG.warn("Couldn't determine duration for {}. Skipping this file.", file.getName()); LOG.warn("Couldn't determine duration for {}. Skipping this file.", file.getName());
file.renameTo(new File(directory, file.getName()+".corrupt")); file.renameTo(new File(directory, file.getName()+".corrupt"));