From 27dac97384aa5a873a78beff609c61ba1702d7f8 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 13 Feb 2019 12:24:04 +0100 Subject: [PATCH] Improve handling of postprocessing --- .../java/ctbrec/recorder/LocalRecorder.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java index dd997053..91e27d62 100644 --- a/common/src/main/java/ctbrec/recorder/LocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/LocalRecorder.java @@ -780,12 +780,10 @@ public class LocalRecorder implements Recorder { generatePlaylist(download.getTarget()); } boolean deleted = deleteIfTooShort(download); - if(deleted) { - // recording was too short. stop here and don't do post-processing - return; + if(!deleted) { + fireRecordingStateChanged(download.getTarget(), POST_PROCESSING, download.getModel(), download.getStartTime()); + postprocess(download); } - fireRecordingStateChanged(download.getTarget(), POST_PROCESSING, download.getModel(), download.getStartTime()); - postprocess(download); fireRecordingStateChanged(download.getTarget(), FINISHED, download.getModel(), download.getStartTime()); }; } @@ -802,8 +800,14 @@ public class LocalRecorder implements Recorder { try { LOG.debug("Determining video length for {}", download.getTarget()); File target = download.getTarget(); - if(!target.exists() || target.length() == 0) { - return true; + if(target.isDirectory()) { + if(!target.exists() || target.list() == null || target.list().length == 0) { + return true; + } + } else { + if(!target.exists() || target.length() == 0) { + return true; + } } double duration = 0;