jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore empty recordings directories

This commit is contained in:
0xboobface 2018-08-30 13:04:35 +02:00
parent c57e0c037c
commit cd827a0cb8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,8 +368,10 @@ public class LocalRecorder implements Recorder {
PlaylistGenerator playlistGenerator = new PlaylistGenerator(); PlaylistGenerator playlistGenerator = new PlaylistGenerator();
playlistGenerators.put(recDir, playlistGenerator); playlistGenerators.put(recDir, playlistGenerator);
try { try {
playlistGenerator.generate(recDir); File playlist = playlistGenerator.generate(recDir);
if(playlist != null) {
playlistGenerator.validate(recDir); playlistGenerator.validate(recDir);
}
} catch (IOException | ParseException | PlaylistException e) { } catch (IOException | ParseException | PlaylistException e) {
LOG.error("Couldn't generate playlist file", e); LOG.error("Couldn't generate playlist file", e);
} catch (InvalidPlaylistException e) { } catch (InvalidPlaylistException e) {
@ -476,11 +478,18 @@ public class LocalRecorder implements Recorder {
} }
for (File subdir : subdirs) { for (File subdir : subdirs) {
// only consider directories
if (!subdir.isDirectory()) { if (!subdir.isDirectory()) {
continue; continue;
} }
// ignore empty directories
File[] recordingsDirs = subdir.listFiles(); File[] recordingsDirs = subdir.listFiles();
if(recordingsDirs.length == 0) {
continue;
}
// start going over valid directories
for (File rec : recordingsDirs) { for (File rec : recordingsDirs) {
String pattern = "yyyy-MM-dd_HH-mm"; String pattern = "yyyy-MM-dd_HH-mm";
SimpleDateFormat sdf = new SimpleDateFormat(pattern); SimpleDateFormat sdf = new SimpleDateFormat(pattern);

8
src/main/java/ctbrec/recorder/PlaylistGenerator.java
View File

@ -44,10 +44,15 @@ public class PlaylistGenerator {
private int lastPercentage; private int lastPercentage;
private List<ProgressListener> listeners = new ArrayList<>(); private List<ProgressListener> listeners = new ArrayList<>();
public void generate(File directory) throws IOException, ParseException, PlaylistException { public File generate(File directory) throws IOException, ParseException, PlaylistException {
LOG.debug("Starting playlist generation for {}", directory); LOG.debug("Starting playlist generation for {}", directory);
// get a list of all ts files and sort them by sequence // get a list of all ts files and sort them by sequence
File[] files = directory.listFiles((f) -> f.getName().endsWith(".ts")); File[] files = directory.listFiles((f) -> f.getName().endsWith(".ts"));
if(files.length == 0) {
LOG.debug("{} is empty. Not going to generate a playlist", directory);
return null;
}
Arrays.sort(files, (f1, f2) -> { Arrays.sort(files, (f1, f2) -> {
String n1 = f1.getName(); String n1 = f1.getName();
n1 = n1.substring(0, n1.length()-3); n1 = n1.substring(0, n1.length()-3);
@ -107,6 +112,7 @@ public class PlaylistGenerator {
writer.write(master); writer.write(master);
LOG.debug("Finished playlist generation for {}", directory); LOG.debug("Finished playlist generation for {}", directory);
} }
return output;
} }
private void updateProgressListeners(double percentage) { private void updateProgressListeners(double percentage) {