diff --git a/client/pom.xml b/client/pom.xml index 2bfba9df..5f7f04d4 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 3.9.0 + 3.10.0 ../master diff --git a/common/pom.xml b/common/pom.xml index 6713bf45..10e5b090 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 3.9.0 + 3.10.0 ../master diff --git a/common/src/main/java/ctbrec/Settings.java b/common/src/main/java/ctbrec/Settings.java index a4599529..d95a50eb 100644 --- a/common/src/main/java/ctbrec/Settings.java +++ b/common/src/main/java/ctbrec/Settings.java @@ -92,7 +92,6 @@ public class Settings { public boolean onlineCheckSkipsPausedModels = false; public int overviewUpdateIntervalInSecs = 10; public String password = ""; // chaturbate password TODO maybe rename this onetime - public String postProcessing = ""; public int postProcessingThreads = 2; public List postProcessors = new ArrayList<>(); public String proxyHost; diff --git a/common/src/main/java/ctbrec/recorder/download/AbstractDownload.java b/common/src/main/java/ctbrec/recorder/download/AbstractDownload.java index 3e522da3..c1f1a939 100644 --- a/common/src/main/java/ctbrec/recorder/download/AbstractDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/AbstractDownload.java @@ -1,59 +1,11 @@ package ctbrec.recorder.download; -import java.io.File; -import java.io.IOException; import java.time.Instant; -import java.util.Arrays; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ctbrec.Config; -import ctbrec.OS; -import ctbrec.Recording; -import ctbrec.io.StreamRedirectThread; public abstract class AbstractDownload implements Download { - private static final Logger LOG = LoggerFactory.getLogger(AbstractDownload.class); - protected Instant startTime; - protected void runPostProcessingScript(Recording recording) throws IOException, InterruptedException { - String postProcessing = Config.getInstance().getSettings().postProcessing; - if (postProcessing != null && !postProcessing.isEmpty()) { - File target = recording.getAbsoluteFile(); - Runtime rt = Runtime.getRuntime(); - String[] args = new String[] { - postProcessing, - target.getParentFile().getAbsolutePath(), - target.getAbsolutePath(), - getModel().getName(), - getModel().getSite().getName(), - Long.toString(recording.getStartDate().getEpochSecond()) - }; - if(LOG.isDebugEnabled()) { - LOG.debug("Running {}", Arrays.toString(args)); - } - Process process = rt.exec(args, OS.getEnvironment()); - // TODO maybe write these to a separate log file, e.g. recname.ts.pp.log - Thread std = new Thread(new StreamRedirectThread(process.getInputStream(), System.out)); - std.setName("Process stdout pipe"); - std.setDaemon(true); - std.start(); - Thread err = new Thread(new StreamRedirectThread(process.getErrorStream(), System.err)); - err.setName("Process stderr pipe"); - err.setDaemon(true); - err.start(); - - int exitCode = process.waitFor(); - LOG.debug("Process finished with exit code {}", exitCode); - if (exitCode != 0) { - throw new ProcessExitedUncleanException("Post-Processing finished with exit code " + exitCode); - } - } - } - @Override public Instant getStartTime() { return startTime; diff --git a/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java b/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java index d6203b2a..e3f1a170 100644 --- a/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java @@ -398,7 +398,6 @@ public class DashDownload extends AbstractDownload { new FfmpegMuxer(dir, file); targetFile = file; recording.setPath(path.substring(0, path.length() - 5)); - runPostProcessingScript(recording); } catch (Exception e) { throw new PostProcessingException(e); } diff --git a/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java index 2e25a9f9..52ed297c 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java @@ -125,12 +125,6 @@ public class FFmpegDownload extends AbstractHlsDownload { @Override public void postprocess(Recording recording) { - Thread.currentThread().setName("PP " + model.getName()); - try { - runPostProcessingScript(recording); - } catch (Exception e) { - throw new PostProcessingException(e); - } } @Override diff --git a/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java index b7f8435e..1d2f034b 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java @@ -215,7 +215,6 @@ public class HlsDownload extends AbstractHlsDownload { try { generatePlaylist(recording); recording.setStatusWithEvent(State.POST_PROCESSING); - runPostProcessingScript(recording); } catch (Exception e) { throw new PostProcessingException(e); } diff --git a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java index 2721efb6..609866b5 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java @@ -489,12 +489,6 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload { @Override public void postprocess(Recording recording) { - Thread.currentThread().setName("PP " + model.getName()); - try { - runPostProcessingScript(recording); - } catch (Exception e) { - throw new PostProcessingException(e); - } } public void downloadFinishedRecording(String segmentPlaylistUri, File target, ProgressListener progressListener, long sizeInBytes) throws Exception { diff --git a/master/pom.xml b/master/pom.xml index c81fb52f..9eb04530 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -6,7 +6,7 @@ ctbrec master pom - 3.9.0 + 3.10.0 ../common diff --git a/server/pom.xml b/server/pom.xml index 9dd10055..d7413299 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -8,7 +8,7 @@ ctbrec master - 3.9.0 + 3.10.0 ../master diff --git a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java index fe8f51bb..36d9e13c 100644 --- a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java @@ -59,7 +59,6 @@ public class ConfigServlet extends AbstractCtbrecServlet { addParameter("maximumResolution", "Maximum Resolution", DataType.INTEGER, settings.maximumResolution, json); addParameter("minimumSpaceLeftInBytes", "Leave Space On Device (GiB)", DataType.LONG, settings.minimumSpaceLeftInBytes, json); addParameter("onlineCheckIntervalInSecs", "Online Check Interval (secs)", DataType.INTEGER, settings.onlineCheckIntervalInSecs, json); - addParameter("postProcessing", "Post-Processing", DataType.STRING, settings.postProcessing, json); addParameter("postProcessingThreads", "Post-Processing Threads", DataType.INTEGER, settings.postProcessingThreads, json); addParameter("recordingsDir", "Recordings Directory", DataType.STRING, settings.recordingsDir, json); addParameter("recordSingleFile", "Record Single File", DataType.BOOLEAN, settings.recordSingleFile, json);