From 3a7f2ceca630a8a3c7561938db771475aeb5d5af Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 28 Nov 2018 15:37:35 +0100 Subject: [PATCH] Add convenience method Config.isDevMode() Also made isServerMode() static --- client/src/main/java/ctbrec/ui/SettingsTab.java | 5 +++++ common/src/main/java/ctbrec/Config.java | 6 +++++- .../main/java/ctbrec/recorder/LocalRecorder.java | 14 +++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/SettingsTab.java b/client/src/main/java/ctbrec/ui/SettingsTab.java index 0d2722e3..d1f816cc 100644 --- a/client/src/main/java/ctbrec/ui/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/SettingsTab.java @@ -319,6 +319,11 @@ public class SettingsTab extends Tab implements TabSelectionListener { layout.add(l, 0, row); List splitOptions = new ArrayList<>(); splitOptions.add(new SplitAfterOption("disabled", 0)); + if(Config.isDevMode()) { + splitOptions.add(new SplitAfterOption( "1 min", 1 * 60)); + splitOptions.add(new SplitAfterOption( "3 min", 3 * 60)); + splitOptions.add(new SplitAfterOption( "5 min", 5 * 60)); + } splitOptions.add(new SplitAfterOption("10 min", 10 * 60)); splitOptions.add(new SplitAfterOption("15 min", 15 * 60)); splitOptions.add(new SplitAfterOption("20 min", 20 * 60)); diff --git a/common/src/main/java/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java index 865f6bc1..20821ea8 100644 --- a/common/src/main/java/ctbrec/Config.java +++ b/common/src/main/java/ctbrec/Config.java @@ -100,10 +100,14 @@ public class Config { Files.write(configFile.toPath(), json.getBytes("utf-8"), CREATE, WRITE, TRUNCATE_EXISTING); } - public boolean isServerMode() { + public static boolean isServerMode() { return Objects.equals(System.getProperty("ctbrec.server.mode"), "1"); } + public static boolean isDevMode() { + return Objects.equals(System.getenv("CTBREC_DEV"), "1"); + } + public File getConfigDir() { return configDir; } diff --git a/common/src/main/java/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java index 14aca3a7..82c5219c 100644 --- a/common/src/main/java/ctbrec/recorder/LocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/LocalRecorder.java @@ -83,7 +83,7 @@ public class LocalRecorder implements Recorder { onlineMonitor.start(); postProcessingTrigger = new PostProcessingTrigger(); - if(Config.getInstance().isServerMode()) { + if(Config.isServerMode()) { postProcessingTrigger.start(); } @@ -161,7 +161,7 @@ public class LocalRecorder implements Recorder { LOG.debug("Starting recording for model {}", model.getName()); Download download; - if (Config.getInstance().isServerMode()) { + if (Config.isServerMode()) { download = new HlsDownload(client); } else { download = new MergedHlsDownload(client); @@ -184,7 +184,7 @@ public class LocalRecorder implements Recorder { Download download = recordingProcesses.get(model); download.stop(); recordingProcesses.remove(model); - if(!Config.getInstance().isServerMode()) { + if(!Config.isServerMode()) { postprocess(download); } } @@ -358,7 +358,7 @@ public class LocalRecorder implements Recorder { LOG.debug("Recording terminated for model {}", m.getName()); iterator.remove(); restart.add(m); - if(config.isServerMode()) { + if(Config.isServerMode()) { try { finishRecording(d.getTarget()); } catch(Exception e) { @@ -385,7 +385,7 @@ public class LocalRecorder implements Recorder { } private void finishRecording(File directory) { - if(Config.getInstance().isServerMode()) { + if(Config.isServerMode()) { Thread t = new Thread() { @Override public void run() { @@ -513,7 +513,7 @@ public class LocalRecorder implements Recorder { @Override public List getRecordings() { - if(Config.getInstance().isServerMode()) { + if(Config.isServerMode()) { return listSegmentedRecordings(); } else { return listMergedRecordings(); @@ -558,7 +558,7 @@ public class LocalRecorder implements Recorder { return GENERATING_PLAYLIST; } - if (config.isServerMode()) { + if (Config.isServerMode()) { if (recording.hasPlaylist()) { return FINISHED; } else {