davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity
2,301 Commits 3 Branches 3 Tags 18 MiB
Commit Graph

285 Commits

Author SHA1 Message Date
0xb00bface 4f8ffe0736 Set version to 4.1.2 2021-04-09 18:46:35 +02:00
0xb00bface bb1727c538 Set version to 4.1.1 2021-03-27 11:42:04 +01:00
0xb00bface c9e5f8e36b Set version to 4.1.0 2021-03-06 14:39:03 +01:00
0xb00bface 4dfb122a97 Set version to 4.1.0 2021-02-28 15:21:04 +01:00
0xb00bface e7b483088e Fix table sort order indicator icon 2021-02-20 19:36:41 +01:00
0xb00bface aa1bb0d847 Add dark mode for web interface 2021-02-20 18:24:31 +01:00
0xb00bface 4721519671 Set version to 4.0.0 2021-02-19 18:08:03 +01:00
0xb00bface 500be5eee4 Merge branch 'dev' into v4 
# Conflicts:
#	common/src/main/java/ctbrec/recorder/FFmpeg.java
 2021-02-13 21:37:39 +01:00
0xb00bface 844fe63fca Reduce some log levels 2021-02-13 21:33:31 +01:00
0xb00bface 185ba21e0f Fix throughtput calculation in web ui 2021-01-30 13:11:29 +01:00
0xb00bface fcffb7892a Set version to version 3.13.1 2021-01-24 12:15:18 +01:00
0xb00bface fa7f1e5f57 Merge branch 'dev' into v4 2021-01-16 21:03:12 +01:00
0xb00bface 0b9c953ac4 Set version to 3.13.0 2021-01-16 20:16:33 +01:00
0xb00bface f7b22ff57b Set version to 3.12.2 2021-01-16 12:12:36 +01:00
0xb00bface df37f4a61c Set version to 3.12.1 2021-01-12 19:47:28 +01:00
0xb00bface 967b5dec42 Use global thread pool instead of creating new threads 2021-01-10 22:14:20 +01:00
0xb00bface f8130acf00 Set version to 3.12.0 2021-01-09 21:58:49 +01:00
0xb00bface cdf582ad8f Merge branch 'dev' into v4 
# Conflicts:
#	client/src/main/java/ctbrec/ui/action/CheckModelAccountAction.java
#	client/src/main/java/ctbrec/ui/controls/SearchPopoverTreeList.java
#	client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java
#	client/src/main/resources/logback.xml
#	common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
#	server/src/main/resources/logback.xml
 2021-01-09 15:59:31 +01:00
0xb00bface 17aa5bc18d Change context menu behavior to make sense with bookmarked models 
- "Record Later" is hidden if it makes sense
- Move models to Active tab, if the are in "Later" tab and then get started
 2021-01-09 12:45:38 +01:00
0xb00bface 2ecc447902 Set system property file.encoding to utf-8 in all start scripts 2021-01-07 20:59:23 +01:00
0xb00bface 08f481e6c9 Adjust logback config 2021-01-03 16:36:04 +01:00
0xb00bface 68e8f3770e Fix ArrayIndexOutOfBounds for in startByName 2021-01-01 17:56:17 +01:00
0xb00bface 4f55687b38 Fix bandwidth calulation for client/server 2021-01-01 13:28:52 +01:00
0xb00bface f86ba637b4 Add automatic scaling of the scheduled thread pool 2020-12-29 14:44:11 +01:00
0xb00bface 9da2f0fc5d Set version to 4.0.0-SNAPSHOT 2020-12-29 14:44:11 +01:00
0xb00bface a4ca98d6b8 Add more settings to ConfigServlet and documentation 2020-12-24 17:30:59 +01:00
0xb00bface 58d8432cf2 Update Java to version 15.0.1 2020-12-24 17:03:53 +01:00
0xb00bface 42904f6fba Set version to 3.11.0 2020-12-24 16:54:25 +01:00
0xb00bface a5834e3533 Add the logback config to the root directory of the assembly 2020-12-20 17:39:47 +01:00
0xb00bface b5640d932f Set version to 3.10.10 2020-12-19 17:46:15 +01:00
0xb00bface 98d9ae5377 Add MVLive to autocomplete list in web interface 2020-12-17 18:53:31 +01:00
0xb00bface 04ee553c1a Set version to 3.10.9 2020-12-15 19:31:29 +01:00
0xb00bface ff273efedc Set version to 3.10.8 2020-12-12 22:27:10 +01:00
0xb00bface 5020f9f06d Update version to 3.10.7 2020-12-06 20:49:59 +01:00
0xb00bface d76ee3994b Fix bug, which caused the HLS servlet to double up the recordings path 2020-12-05 23:21:06 +01:00
0xb00bface 5135e10c19 Change config servlet for the new split options 2020-12-05 23:18:45 +01:00
0xb00bface ab911baeae Bump version to 3.10.6 2020-12-04 21:05:18 +01:00
0xb00bface 678d7b0174 Set version to 3.10.5 2020-11-21 20:51:23 +01:00
0xb00bface cd840afe0d Add idea project files to .gitignore 2020-11-21 19:20:01 +01:00
0xb00bface 17b0a51d02 Set version to 3.10.4 2020-10-31 22:19:15 +01:00
0xb00bface bf0e99bd0f Set version to 3.10.3 2020-10-24 11:37:46 +02:00
0xb00bface f7775b4671 Add button to pause recording entirely without pausing all models 2020-10-17 16:43:23 +02:00
0xb00bface fcbe4a2e25 Add automatic redirect and custom 404 page 2020-10-11 21:50:38 +02:00
0xb00bface 24fa1a6ed6 Set version to 3.10.2 2020-10-08 21:49:01 +02:00
0xb00bface 48605554f8 Change unit in label for minimumSpaceLeftInBytes 2020-10-05 18:52:12 +02:00
0xb00bface e250628c96 Add com.sun.activation for Java versions > 8 2020-10-04 16:03:56 +02:00
0xb00bface 986744dfe7 Improve file handling in HLS servlet 2020-10-03 18:29:09 +02:00
0xb00bface 1c55593e7f Add timeout to systemd service file 
Increase the systemd timeout, so that it waits for ctbrec to finish the
post-processing.
Also changed SyslogIdentifier=ctbrec to reflect the real name instead of
a test name.
 2020-09-29 13:33:50 +02:00
0xb00bface 8b6d246732 Merge branch 'pp' into dev 2020-09-27 15:25:49 +02:00
0xb00bface 93deeb3e52 Remove unused postProcessing setting 2020-09-26 17:22:42 +02:00
0xb00bface 4aca861390 Remove unused settings 2020-09-26 16:32:31 +02:00
0xb00bface 6e63fae244 Improve mimetype handling for the HlsServlet 2020-09-24 21:05:59 +02:00
0xb00bface e1bce0acf5 Improve handling of the orignal and pp files 2020-09-22 12:38:21 +02:00
0xb00bface 90192d9b8f Fix server stuff for new recording path handling 2020-09-13 19:54:43 +02:00
0xb00bface 1034488e94 Make RecorderServlet and RemoteRecorder compatible to new recording 
fields
 2020-08-24 15:15:34 +02:00
0xb00bface 7bb33568cf Add new event for when the disk space is exhausted 2020-08-21 17:09:07 +02:00
0xb00bface da3f0632e2 Set version to 3.9.0 2020-08-19 17:21:48 +02:00
0xb00bface 7e2924d780 Add confirmation dialog for shutdown 
Show confirmation dialog when a shutdown is requested and there are
recordings in progress. The user now can decide to shutdown immediately,
shutdown gracefully or leave the app running
 2020-08-19 12:45:47 +02:00
0xb00bface d2bffa9e9b Add MVLive to the server 2020-08-18 19:57:31 +02:00
0xb00bface 243d5f4ecf Fix bug in recorder servlet 
Actions unpin and setNote where mixed up
 2020-08-17 13:46:07 +02:00
0xb00bface 4139e42ce2 Set version to 3.8.6 2020-08-16 14:16:38 +02:00
0xb00bface 0fe16f8ff8 Add setting to disable online check for paused models 2020-08-09 12:27:04 +02:00
0xb00bface c02d9562bf Set version to 3.8.5 2020-08-09 11:05:56 +02:00
0xb00bface caf329eb23 Change look of the model table in the web interface 2020-08-08 20:11:48 +02:00
0xb00bface e55daa0772 Add GUI and remote support for temporary recordings 2020-08-08 17:51:03 +02:00
0xb00bface 81643545d2 Set version to 3.8.4 2020-07-26 15:42:36 +02:00
0xb00bface bc872b1ed5 Set version to 3.8.3 2020-07-19 18:23:32 +02:00
0xboobface ed26228d7b Increase version number to 3.8.2 2020-07-12 13:11:19 +02:00
0xboobface e7349b2118 Set version to 3.8.1 2020-07-03 19:12:18 +02:00
0xboobface 4205cb6ff2 Use rolling file appender for the log files 2020-06-30 20:48:48 +02:00
0xboobface 6e25f98b2b Add range slider for the recording resolution 2020-06-13 20:08:25 +02:00
0xboobface 229fc1f432 Add possibility to add notes to recordings 2020-06-13 19:32:00 +02:00
0xboobface a4ceb2f513 Add current bandwidth throughput to webinterface 2020-06-12 19:11:14 +02:00
0xboobface bd48d6bf9c Set version to 3.8.0 2020-06-12 18:10:56 +02:00
0xboobface ccab1261dc Implement adding model by name in the webinterface like in the JavaFX 
GUI
 2020-06-11 20:55:14 +02:00
0xboobface 28e6313d41 Implement the ConfigServlet 
Most of the server relevant options can now be changed in the
webinterface.
 2020-06-11 19:58:59 +02:00
0xboobface 44fd340323 Implement loading of the config into the webpage 2020-06-11 19:58:59 +02:00
0xboobface 1b75340f74 Add authentication to config servlet 2020-06-11 19:58:59 +02:00
0xboobface e1fb29b7c8 Add first implementation of a config servlet 2020-06-11 19:58:59 +02:00
0xboobface 0ed6d93d30 Set version to 3.7.3 2020-06-09 19:36:17 +02:00
0xboobface 7e4a6393b0 Set version to 3.7.2 2020-06-07 13:57:15 +02:00
0xboobface c8614d7208 Set version to 3.7.1 2020-05-31 18:44:04 +02:00
0xboobface 79892b1a13 Add systemd service example to the server zip 2020-05-30 20:31:41 +02:00
0xboobface 7f661c3dc1 Add a HTTP and a HTML header with the version of ctbrec 2020-05-29 20:21:13 +02:00
0xboobface 5e46933905 Try to log in on startup 
Maybe we have to change this in the future so that the server logs in
on a regular basis.
 2020-05-23 13:47:57 +02:00
0xboobface 66b37b65c0 Set version to 3.7.0 2020-05-16 22:20:06 +02:00
0xboobface 6c85a2a493 First working version of Showup.tv 2020-05-16 16:28:44 +02:00
0xboobface bd92c315fb Set version to 3.6.4 2020-05-13 18:46:24 +02:00
0xboobface e6dae3b2af Set version to 3.6.3 2020-05-10 12:03:32 +02:00
0xboobface 8cdc2a4a56 Set version to 3.6.2 2020-05-02 14:43:20 +02:00
0xboobface b402bb0df7 Set version to 3.6.1 2020-04-28 22:07:38 +02:00
0xboobface aa42e82153 Set version to 3.6.0 2020-04-13 18:53:29 +02:00
0xboobface 243d2757b0 Set version to 3.5.0 2020-03-19 15:01:34 +01:00
0xboobface 6f57579041 Add pinning for recordings 
Recordings can now be set to pinned. Pinned recordings cannot be
deleted.
 2020-03-16 16:10:09 +01:00
0xboobface 3636d34d22 Set version to 3.4.0 2020-02-27 20:59:53 +01:00
0xboobface 3ec4d74545 Add Stripchat to server 2020-02-23 19:52:34 +01:00
0xboobface 4dcf9944f8 Set version to 3.3.0 2020-02-22 17:57:03 +01:00
0xboobface 627200d18d Add download for single file recordings to web interface 2020-02-22 17:44:40 +01:00
0xboobface 71be9b3665 Improve support for server-side single files 2020-02-22 17:40:22 +01:00
0xboobface e98a3bc7c2 Set version to 3.2.1 2020-02-16 17:04:46 +01:00
0xboobface 9a4461a0d1 Set version to 3.2.0 2020-02-01 10:03:56 +01:00
0xboobface b66989fe85 Set version to 3.1.0 2020-01-11 11:30:02 +01:00
0xboobface d82c3b490b Implement recording priorities for RemoteRecorder 2020-01-04 15:30:54 +01:00
0xboobface 808810b6d6 Set version to 3.0.4 2020-01-03 12:43:07 +01:00
0xboobface 5164512287 Change the linux server start script to be more like an init script 2020-01-02 15:13:02 +01:00
0xboobface 499708ffcf Set version to 3.0.3 2019-12-30 14:52:04 +01:00
0xboobface 296396f2d3 Set version to 3.0.2 2019-12-27 15:17:53 +01:00
0xboobface 33c298d558 Set version to 3.0.1 2019-12-26 21:46:06 +01:00
0xboobface 14dd11a2e6 Add instructions for ffmpeg to the server README 2019-12-26 21:45:34 +01:00
0xboobface 27e1857073 Adjust log level 2019-12-21 19:55:00 +01:00
0xboobface dbcd7f488e Fix HMAC calculation for HLS streams 2019-12-21 17:50:22 +01:00
0xboobface 306c3eaf3c Improve startup status message for HMAC auth 2019-12-21 17:49:52 +01:00
0xboobface 630cb6a6a5 Adjust log level for http headers 2019-12-21 17:49:22 +01:00
0xboobface ce103853a3 Fix SonarLint issues 2019-12-21 14:46:59 +01:00
0xboobface a4b805c038 Set version to 3.0.0 2019-12-21 14:33:45 +01:00
0xboobface e37c869695 Merge branch 'dev' into mp4-streaming 2019-12-17 21:27:16 +01:00
0xboobface ab81fa4c94 Fix path check bug in HlsServlet and support dir symlinks 
String.startsWith() comparison for the canonical recording dir
did not always check the last component correctly:

recordingDir: /path/to/dir
request: ../dirOther/filename
 2019-12-17 21:18:29 +01:00
0xboobface 88735d93ee Remove unused exceptions in HlsServlet 2019-12-17 21:14:33 +01:00
0xboobface e734d46e9c Add gitattributes and run initial normalization 2019-12-17 21:13:18 +01:00
0xboobface b9f463d0dd Bump version to 2.3.0 2019-12-08 19:04:22 +01:00
0xboobface 5ce2bd9901 Add byte range support for HTTP requests 2019-12-08 18:37:26 +01:00
0xboobface cb90ff8264 Set video height depending on screen size 2019-12-08 18:36:42 +01:00
0xboobface 402dd568f9 Add support for MP4 videos 2019-12-07 18:10:04 +01:00
0xboobface 8eb202255e Reactivate MFC in the server 2019-12-07 11:53:48 +01:00
0xboobface 43dfc4e59c Set versions in maven POMs 2019-11-23 17:14:44 +01:00
0xboobface 7c29bba16e Set version to 2.2.0 2019-08-10 18:25:40 +02:00
0xboobface f12a20a15e Add support for TLS and changing the context path 2019-08-10 17:45:13 +02:00
0xboobface bb02b5fd9f Add HMAC support to the webinterface 
The webinterface didn't work, if HMAC authentication was enabled.
To make this work, the webinterface downloads the HMAC from the
server and stores it in the local storage of the browser. The
download URL is secured by Basic Auth. The credentials are configured
in the server.json
 2019-08-04 12:51:13 +02:00
0xboobface 8450ddd98c Increase version to 2.1.0 2019-07-27 18:27:54 +02:00
0xboobface bc724b2f42 Add setting to switch on/off the server webinterface 2019-07-27 17:55:42 +02:00
0xboobface 1e5eff780c Add input field to add models by URL 2019-07-27 16:53:26 +02:00
0xboobface 2417ee0069 Add progress bar for disk space 2019-07-21 17:13:53 +02:00
0xboobface c36984f72d Enable recordings buttons only if FINISHED 2019-07-21 15:23:12 +02:00
0xboobface d4b7545fae Add sorting for the recordings table 2019-07-21 15:08:12 +02:00
0xboobface d6beaac5f9 Make model table sortable 2019-07-21 13:38:38 +02:00
0xboobface 88040e9a0b Disable MyFreeCams for the time being 2019-07-21 10:46:46 +02:00
0xboobface 1db79541ff Add web interface for the server 2019-07-21 10:39:00 +02:00
0xboobface ca17d4758c Increase version to 2.0.1 2019-06-07 21:24:12 +02:00
0xboobface b136fce0db Add menu entry to rerun the post-processing script 
In client/server mode this will trigger the playlist generation and
post-processing. In standalone mode only the post-processing will be
executed.
 2019-06-02 19:53:25 +02:00
0xboobface ebe9d0cf5e Fix remaining problems with remote recording 2019-06-01 15:33:47 +02:00
0xboobface 9302dffd7f Set version to 2.0.0 2019-06-01 15:32:47 +02:00
0xboobface f11fcf7ca1 Rewrite recording code for remote recording 2019-06-01 12:12:46 +02:00
0xboobface 0f3d0b6337 Rewrite recording code for local recording 
Remote recording is TBD
 2019-05-31 20:00:07 +02:00
0xboobface 88a6ab3a91 Correct typo 2019-04-21 15:04:43 +02:00
0xboobface f4b7141a63 Increase version to 1.21.1 2019-04-20 16:03:04 +02:00
0xboobface b854455f8a Increase version to 1.21.0 2019-04-20 14:27:01 +02:00
0xboobface f1d11c07b5 Merge branch 'dev' into flirt4free 2019-04-15 16:02:35 +02:00
0xboobface 8eb5f3f33d Set version to 1.20.0 2019-04-14 20:38:32 +02:00
0xboobface 15bfe0f44f Add basic functionality for Flirt4Free 2019-04-12 21:57:53 +02:00
0xboobface 73221ce881 Set version to 1.19.1 2019-04-04 19:00:49 +02:00