From a4ca98d6b8a984d9f9bce78ed6fcc30c0d3e0702 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Thu, 24 Dec 2020 17:23:36 +0100 Subject: [PATCH] Add more settings to ConfigServlet and documentation --- CHANGELOG.md | 5 ++++- client/src/main/resources/html/docs/ConfigurationFile.md | 2 ++ .../src/main/java/ctbrec/recorder/server/ConfigServlet.java | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84406ec7..e0cc526e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ -3.10.11 +3.11.0 ======================== * Added config option for faster scroll speed +* Added a few more settings to the web interface +* Updated Configration.md page in help section +* Updated bundled Java to version 15.0.1 3.10.10 ======================== diff --git a/client/src/main/resources/html/docs/ConfigurationFile.md b/client/src/main/resources/html/docs/ConfigurationFile.md index 0c3418ec..f35fa26f 100644 --- a/client/src/main/resources/html/docs/ConfigurationFile.md +++ b/client/src/main/resources/html/docs/ConfigurationFile.md @@ -43,6 +43,8 @@ the port ctbrec tries to connect to, if it is run in remote mode. - **livePreviews** (app only) - Enables the live preview feature in the app. +- **logFFmpegOutput** - The output from FFmpeg (from recordings or post-processing steps) will be logged in temporary files. + - **minimumResolution** - [1 - 2147483647]. Sets the minimum video height for a recording. ctbrec tries to find a stream quality, which is higher than or equal to this value. If the only provided stream quality is below this threshold, ctbrec won't record the stream. - **maximumResolution** - [1 - 2147483647]. Sets the maximum video height for a recording. ctbrec tries to find a stream quality, which is lower than or equal to this value. If the only provided stream quality is above this threshold, ctbrec won't record the stream. diff --git a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java index 44a0041e..ec3c8f8d 100644 --- a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java @@ -56,10 +56,12 @@ public class ConfigServlet extends AbstractCtbrecServlet { addParameter("httpUserAgent", "User-Agent", DataType.STRING, settings.httpUserAgent, json); addParameter("httpUserAgentMobile", "Mobile User-Agent", DataType.STRING, settings.httpUserAgentMobile, json); addParameter("generatePlaylist", "Generate Playlist", DataType.BOOLEAN, settings.generatePlaylist, json); + addParameter("fastPlaylistGenerator", "Use Fast Playlist Generator", DataType.BOOLEAN, settings.fastPlaylistGenerator, json); addParameter("minimumResolution", "Minimum Resolution", DataType.INTEGER, settings.minimumResolution, json); addParameter("maximumResolution", "Maximum Resolution", DataType.INTEGER, settings.maximumResolution, json); addParameter("minimumSpaceLeftInBytes", "Leave Space On Device (bytes)", DataType.LONG, settings.minimumSpaceLeftInBytes, json); addParameter("onlineCheckIntervalInSecs", "Online Check Interval (secs)", DataType.INTEGER, settings.onlineCheckIntervalInSecs, json); + addParameter("onlineCheckSkipsPausedModels", "Skip Online Check For Paused Models", DataType.BOOLEAN, settings.onlineCheckSkipsPausedModels, 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); @@ -70,6 +72,8 @@ public class ConfigServlet extends AbstractCtbrecServlet { addParameter("webinterface", "Web-Interface", DataType.BOOLEAN, settings.webinterface, json); addParameter("webinterfaceUsername", "Web-Interface User", DataType.STRING, settings.webinterfaceUsername, json); addParameter("webinterfacePassword", "Web-Interface Password", DataType.STRING, settings.webinterfacePassword, json); + addParameter("servletContext", "Servlet Context", DataType.STRING, settings.servletContext, json); + addParameter("logFFmpegOutput", "Log FFmpeg Output", DataType.BOOLEAN, settings.logFFmpegOutput, json); resp.setStatus(SC_OK); resp.setContentType("application/json"); @@ -158,6 +162,7 @@ public class ConfigServlet extends AbstractCtbrecServlet { break; case SPLIT_STRATEGY: corrected = SplitStrategy.valueOf(value.toString()); + break; default: break; }