ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Add convenience method Config.isDevMode() 

Also made isServerMode() static
This commit is contained in:
0xboobface 2018-11-28 15:37:35 +01:00
parent e9909fe11a
commit 3a7f2ceca6
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/ctbrec/ui/SettingsTab.java
View File

@ -319,6 +319,11 @@ public class SettingsTab extends Tab implements TabSelectionListener {
layout.add(l, 0, row); layout.add(l, 0, row);
List<SplitAfterOption> splitOptions = new ArrayList<>(); List<SplitAfterOption> splitOptions = new ArrayList<>();
splitOptions.add(new SplitAfterOption("disabled", 0)); 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("10 min", 10 * 60));
splitOptions.add(new SplitAfterOption("15 min", 15 * 60)); splitOptions.add(new SplitAfterOption("15 min", 15 * 60));
splitOptions.add(new SplitAfterOption("20 min", 20 * 60)); splitOptions.add(new SplitAfterOption("20 min", 20 * 60));

6
common/src/main/java/ctbrec/Config.java
View File

@ -100,10 +100,14 @@ public class Config {
Files.write(configFile.toPath(), json.getBytes("utf-8"), CREATE, WRITE, TRUNCATE_EXISTING); 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"); return Objects.equals(System.getProperty("ctbrec.server.mode"), "1");
} }
public static boolean isDevMode() {
return Objects.equals(System.getenv("CTBREC_DEV"), "1");
}
public File getConfigDir() { public File getConfigDir() {
return configDir; return configDir;
} }

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

@ -83,7 +83,7 @@ public class LocalRecorder implements Recorder {
onlineMonitor.start(); onlineMonitor.start();
postProcessingTrigger = new PostProcessingTrigger(); postProcessingTrigger = new PostProcessingTrigger();
if(Config.getInstance().isServerMode()) { if(Config.isServerMode()) {
postProcessingTrigger.start(); postProcessingTrigger.start();
} }
@ -161,7 +161,7 @@ public class LocalRecorder implements Recorder {
LOG.debug("Starting recording for model {}", model.getName()); LOG.debug("Starting recording for model {}", model.getName());
Download download; Download download;
if (Config.getInstance().isServerMode()) { if (Config.isServerMode()) {
download = new HlsDownload(client); download = new HlsDownload(client);
} else { } else {
download = new MergedHlsDownload(client); download = new MergedHlsDownload(client);
@ -184,7 +184,7 @@ public class LocalRecorder implements Recorder {
Download download = recordingProcesses.get(model); Download download = recordingProcesses.get(model);
download.stop(); download.stop();
recordingProcesses.remove(model); recordingProcesses.remove(model);
if(!Config.getInstance().isServerMode()) { if(!Config.isServerMode()) {
postprocess(download); postprocess(download);
} }
} }
@ -358,7 +358,7 @@ public class LocalRecorder implements Recorder {
LOG.debug("Recording terminated for model {}", m.getName()); LOG.debug("Recording terminated for model {}", m.getName());
iterator.remove(); iterator.remove();
restart.add(m); restart.add(m);
if(config.isServerMode()) { if(Config.isServerMode()) {
try { try {
finishRecording(d.getTarget()); finishRecording(d.getTarget());
} catch(Exception e) { } catch(Exception e) {
@ -385,7 +385,7 @@ public class LocalRecorder implements Recorder {
} }
private void finishRecording(File directory) { private void finishRecording(File directory) {
if(Config.getInstance().isServerMode()) { if(Config.isServerMode()) {
Thread t = new Thread() { Thread t = new Thread() {
@Override @Override
public void run() { public void run() {
@ -513,7 +513,7 @@ public class LocalRecorder implements Recorder {
@Override @Override
public List<Recording> getRecordings() { public List<Recording> getRecordings() {
if(Config.getInstance().isServerMode()) { if(Config.isServerMode()) {
return listSegmentedRecordings(); return listSegmentedRecordings();
} else { } else {
return listMergedRecordings(); return listMergedRecordings();
@ -558,7 +558,7 @@ public class LocalRecorder implements Recorder {
return GENERATING_PLAYLIST; return GENERATING_PLAYLIST;
} }
if (config.isServerMode()) { if (Config.isServerMode()) {
if (recording.hasPlaylist()) { if (recording.hasPlaylist()) {
return FINISHED; return FINISHED;
} else { } else {