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

837 Commits

Author SHA1 Message Date
0xb00bface 6e9b92effa Add minimize to tray 2021-04-18 12:17:02 +02:00
0xb00bface ce98919499 code cleanup 2021-04-18 11:44:01 +02:00
0xb00bface f0cd128aa4 Set version to 4.1.3 2021-04-17 11:36:44 +02:00
0xb00bface c948507bcc Fix bug, which causes the deletion of the ignored models list 2021-04-17 11:30:19 +02:00
0xb00bface 9828945ea4 Change CSRF regex to be compatible with Java 8 2021-04-11 13:29:27 +02:00
0xb00bface ace7eb1220 Retrieve API URL from Manyvids insteaed of using a constant 2021-04-11 13:24:39 +02:00
0xb00bface 4c1b311559 Return the best match in the cookie list 
The cookies for a domain could contain two or more cookies for the same
domain, but with different paths. We now return the best matching cookie
only and not all.
 2021-04-11 13:22:24 +02:00
0xb00bface 5293affe4d Assume first .jpg is the contactsheet 2021-04-10 17:36:27 +02:00
0xb00bface 4f8ffe0736 Set version to 4.1.2 2021-04-09 18:46:35 +02:00
0xb00bface 977cee5af0 Fix retrieving the CSRF token for CamSoda 2021-04-09 18:18:02 +02:00
0xb00bface 924c60fb0e Convert ignore list in a list of URLs to save space 2021-03-27 19:23:27 +01:00
0xb00bface f57f36de05 Fix loading of live thumbnails in the search popup 2021-03-27 18:43:13 +01:00
0xb00bface dd6f41a574 Fix bug, which could cause recordings to get stuck 2021-03-27 17:34:14 +01:00
0xb00bface f3c0066d93 Remove log statement 2021-03-27 11:58:48 +01:00
0xb00bface bb1727c538 Set version to 4.1.1 2021-03-27 11:42:04 +01:00
0xb00bface 052758b11e Add new showtype to online state mapping for Cam4 models 2021-03-06 14:39:53 +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 8c359e5772 Fix Camsoda playlist URLs 
They changed their code again, which constructs the playlist URLs
 2021-02-28 15:09:39 +01:00
0xb00bface 2a6d0fb617 Don't print HTML parsing worning for offline Bongacams models 2021-02-20 13:35:56 +01:00
0xb00bface 4721519671 Set version to 4.0.0 2021-02-19 18:08:03 +01:00
0xb00bface 4a595da355 Fix BongaCams online check 2021-02-19 17:07:40 +01:00
0xb00bface 0f125f6e63 Add config setting to log missed segments 2021-02-13 22:39:21 +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 303485a315 Introduce config setting for contact sheet timestamp style 2021-02-13 21:34:08 +01:00
0xb00bface 7e3ceb29f4 Suppress log statement for Stream Closed 2021-02-13 21:33:46 +01:00
0xb00bface 844fe63fca Reduce some log levels 2021-02-13 21:33:31 +01:00
0xb00bface a4c13fcf56 Merge branch 'dev' into v4 2021-02-13 21:30:38 +01:00
0xb00bface cf19ab9697 Remove quiet start parameter for FFmpeg 2021-02-13 18:03:27 +01:00
0xb00bface 1cf62f362d Speed up creation of contact sheet 
Use FFmpegs select filter
Also add a config option to add a timestamp to the thumbs
 2021-02-13 16:52:58 +01:00
0xb00bface 3e7d52a988 Delete the directory itself in deleteDirectory 2021-02-13 16:36:10 +01:00
0xb00bface 73eb13944c Add new class RecordingDownload for recording downloads 
This class inherits from MergedFfmpegHlsDownload, but doesn't create a
directory and start FFmpeg in the init method.
Moved the dedicated methods for recording downloads from
MergedFfmpegHlsDownload to RecordingDownload.
 2021-01-30 13:03:42 +01:00
0xb00bface dcfb29a90f Fix online state detection for Bongacams 2021-01-26 22:55:15 +01:00
0xb00bface e48df6cd1f Fix online state detection for Bongacams 2021-01-26 22:53:49 +01:00
0xb00bface 0f5a05bfd7 Make Showup downloads work in v4 
Also fix the Followed tab
 2021-01-24 20:12:52 +01:00
0xb00bface e789ce2029 Stop download if the playlist request timed out 5 times 2021-01-24 13:36:51 +01:00
0xb00bface 10321f32bd Reduce log level of updateCloudFlareCookies 2021-01-24 12:59:59 +01:00
0xb00bface bd9645105b Merge branch 'dev' into v4 
# Conflicts:
#	client/pom.xml
#	common/pom.xml
#	master/pom.xml
#	server/pom.xml
 2021-01-24 12:36:10 +01:00
0xb00bface fcffb7892a Set version to version 3.13.1 2021-01-24 12:15:18 +01:00
0xb00bface d3c5342791 Fix MVLive recordings 2021-01-24 12:12:38 +01:00
0xb00bface 51c1a82f1d Fix Streamate search URL 2021-01-24 01:06:53 +01:00
0xb00bface d58a8c1d06 Fix Streamate URLs for the thumbnail pages 2021-01-24 00:43:46 +01:00
0xb00bface f646c28151 Add setting for playlist request timeout 2021-01-23 22:57:59 +01:00
0xb00bface ce4a8fe24e Add if state ments to conditionally execute log.trace 2021-01-23 17:00:47 +01:00
0xb00bface 8855591f0f Fix race condition in code for streaming segments to FFmpeg 
This caused stuttering and jumps mostly in the beginning of a recording
 2021-01-23 16:24:24 +01:00
0xb00bface 9be4c07049 Change debug mechanisms for HLS 2021-01-23 13:38:57 +01:00
0xb00bface 3202d5d2cd Call stop() instead of setting running=false 2021-01-23 13:13:25 +01:00
0xb00bface e9a71bd6f1 Fix bug in grep method 2021-01-23 13:11:59 +01:00
0xb00bface 62cafd7b40 Fix use of wrong setting variable 2021-01-23 10:24:08 +01:00
0xb00bface 7aa96eabae Fix variable naming smell 2021-01-23 10:23:46 +01:00
0xb00bface 508a25f3b5 Use a cached thread pool instead of a fixed size thread pool 2021-01-23 10:23:20 +01:00
0xb00bface 326f970aa5 Add grep method 2021-01-23 10:22:54 +01:00
0xb00bface 3fedfe4be7 Replace CompletableFuture with a submit to segmentDownloadPool 2021-01-16 23:02:14 +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 368120e8e6 Add tab for recently watched models 2021-01-16 18:28:49 +01:00
0xb00bface 66d234e668 Remove restriction of download thread pool size (was 100 before) 2021-01-16 15:52:07 +01:00
0xb00bface 19da3c43bf Take into account all files of a recording to determine its size 2021-01-16 15:05:28 +01:00
0xb00bface f7b22ff57b Set version to 3.12.2 2021-01-16 12:12:36 +01:00
0xb00bface 505c501428 Stop hlsdl if the recording size didn't change for 90 seconds 2021-01-16 00:41:59 +01:00
0xb00bface ed3a370d18 Fix Cam4 search 2021-01-13 20:22:11 +01:00
0xb00bface 3d4bd6f331 Fix problem with Cam4 edge URLs 
The edge URLs are already abosulte, so the base URL does not have to be
prepended
 2021-01-12 20:43:12 +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 ec9c463f80 Move global thread pool to common 2021-01-10 20:17:18 +01:00
0xb00bface e709e2d45d Merge branch 'dev' into v4 2021-01-10 18:01:59 +01:00
0xb00bface 1baa216150 Implement splitting for hlsdl downloads 2021-01-09 22:24:51 +01:00
0xb00bface 8e22112603 Add support for hlsdl 2021-01-09 22:03:01 +01:00
0xb00bface f8130acf00 Set version to 3.12.0 2021-01-09 21:58:49 +01:00
0xb00bface 632f104f03 Code cleanup 2021-01-09 19:07:54 +01:00
0xb00bface 2b8bb40f6d Rename FfmpegStreamRedirector to ProcessStreamRedirector 2021-01-09 19:06:52 +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 c4c5099c0d Add HTTP header factory to Cam4Model 2021-01-09 14:49:02 +01:00
0xb00bface e548f25f2d Remove some compiler and sonar warnings 2021-01-09 14:03:03 +01:00
0xb00bface dc12e12dc0 Add HTTP header factory to Cam4Model 
The edge URL requires a Referer header as @gohufrapoc@mastodon.cloud found out. Otherwise you get a HTTP 403 error.
We also set a few other standard headers.
 2021-01-09 13:50:51 +01:00
0xb00bface 7a36f49896 Add methods to null-safe extract a JSON object or array from the response body 2021-01-09 13:47:29 +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 de19de2efe Fix add by model URL for MV Live 2021-01-03 20:54:45 +01:00
0xb00bface d43e022563 Add "record later" tab to "bookmark" models 2021-01-03 18:37:21 +01:00
0xb00bface b0eb6e4411 Add setting to show total model count in title bar 2021-01-02 14:49:56 +01:00
0xb00bface 8251f41c50 Make sure to use lower case model names for Cam4 2021-01-02 13:04:53 +01:00
0xb00bface ebaf4c4c9f Run NextGenLocalRecorder.startRecordingProcess(Model) async 2021-01-02 13:04:31 +01:00
0xb00bface ea8e5d7ac5 Remove some compiler warnings 2021-01-02 12:14:55 +01:00
0xb00bface fb77e51e53 Run NextGenLocalRecorder.startRecordingProcess() async 2021-01-02 11:59:38 +01:00
0xb00bface 1ed2190a3b Improve logging message 2021-01-01 21:08:37 +01:00
0xb00bface 52f10c9fa7 Catch AssertionError in AccuratePlaylistGenerator 2021-01-01 20:33:47 +01:00
0xb00bface 62602b552f Remove a few code smells 2021-01-01 17:23:53 +01:00
0xb00bface 1ae3743bed Remove print statement 2021-01-01 17:17:18 +01:00
0xb00bface a9d5888190 Call onExit in waitFor 2021-01-01 17:09:12 +01:00
0xb00bface 3c25a41e3a Improve logging 2021-01-01 16:39:42 +01:00
0xb00bface e0dbb0eea7 Remove download thread pool size settings 
ThreadPoolScaler takes care of the correct size. The setting is not
needed anymore
 2021-01-01 16:39:29 +01:00
0xb00bface 9dde3fe842 Allow 3 playlist download errors before stopping a recording 2021-01-01 15:45:04 +01:00
0xb00bface a1a5fbc3a6 Remove old AbstractHlsDownload class 2021-01-01 15:39:55 +01:00
0xb00bface f730943245 Optimize multi-threading 
- Set thread priorities for different thread pools
- Run costly stuff in downloadCompletionHandler asynchronously
 2021-01-01 14:58:38 +01:00
0xb00bface a1492927e6 Upgrade okhttp to 4.9.0 2021-01-01 14:12:51 +01:00
0xb00bface 4aef12ceee Fix typo in log message 2021-01-01 13:57:41 +01:00
0xb00bface 4f55687b38 Fix bandwidth calulation for client/server 2021-01-01 13:28:52 +01:00
0xb00bface dbb44e1374 Move request throttle for Chaturbate to ChaturbateHttpClient 2021-01-01 13:23:32 +01:00
0xb00bface 602c81d18d Adjust ThreadPoolScaler behavior 
- ramp up at 65% thread usage
- ramp down at 15% thread usage
- added cooldowns for ramp down, 10 secs after ramp down, 30 seconds
after ramp up
 2021-01-01 13:09:37 +01:00
0xb00bface 93a662ce22 Add check to pp to not re-save deleted recordings 2020-12-31 12:51:49 +01:00
0xb00bface f86ba637b4 Add automatic scaling of the scheduled thread pool 2020-12-29 14:44:11 +01:00
0xb00bface c79cc826d7 Improve bandwidth meter performance 2020-12-29 14:44:11 +01:00
0xb00bface 5d50515b81 Add cleanup to method start and set the interval to 24h 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 e08cf998d5 Remove query part from segment file name 2020-12-29 14:44:11 +01:00
0xb00bface 1c8758ef52 Fix race condition in HlsDownload 2020-12-29 14:44:11 +01:00
0xb00bface 32429b192c Make MergedFfmpegHlsDownload work again 2020-12-29 14:44:11 +01:00
0xb00bface 7e03b48895 Fixed error handling for new multi-threading 2020-12-29 14:44:11 +01:00
0xb00bface e3270b6221 Refactored multi-threading for downloads 
This is a first kind of working version. HlsDownload records, but teh error handling is broken.
 2020-12-29 14:44:11 +01:00
0xb00bface 65ffbf525d Refactored HLS downloads 2020-12-29 14:44:11 +01:00
0xb00bface 52cdc82044 Fix chaturbate follow/unfollow response parsing 2020-12-29 14:43:26 +01:00
0xb00bface ac3f91eb03 Add setting to show confirmation dialogs for dangerous actions 2020-12-27 14:35:18 +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 8b55e9d374 Reduce number of threads to read FFmpeg output 2020-12-24 13:10:25 +01:00
0xb00bface 9a270bb84b Add config option for fast scroll speed 2020-12-24 12:10:16 +01:00
0xb00bface e3925e992d Add migration step for Cam4 model notes 2020-12-24 12:02:37 +01:00
0xb00bface ec71dc3c6d Remove dead download code 2020-12-22 15:15:21 +01:00
0xb00bface 8fa785862b Fix MVLive models being detected as online while being offline 2020-12-21 20:10:12 +01:00
0xb00bface 086e15578f Core cleanup 2020-12-21 20:05:22 +01:00
0xb00bface 97715aecc5 Improve UI features for time limited recordings 2020-12-21 18:53:34 +01:00
0xb00bface 8fe48f91b7 Update playlist all the time 
Before the playlist was only retrieved, when it was empty (on the
initial call). Now the playlist is updated every time.
 2020-12-21 18:17:19 +01:00
0xb00bface 43d8b9d2de Add cache control headers to Cam4 requests 2020-12-21 15:07:50 +01:00
0xb00bface 6875de9b14 Add more logging to Cam4Model 2020-12-20 20:46:01 +01:00
0xb00bface 3b8022df87 Add switch to choose between fast and accurate playlist generation 2020-12-20 20:16:16 +01:00
0xb00bface cf165b7fc0 Make Showup login work with minimal browser 2020-12-20 16:27:48 +01:00
0xb00bface 5f4e17c2d2 Merge branch 'dev' into showup 
# Conflicts:
#	common/src/main/java/ctbrec/sites/showup/ShowupHttpClient.java
 2020-12-20 12:23:08 +01:00
0xb00bface 867e500fbd Fix MVLive recordings 2020-12-20 00:08:07 +01:00
0xb00bface 672d2a77d4 Add another playlist source for Cam4 models 2020-12-19 19:29:15 +01:00
0xb00bface c9cd6e825d Add Model.exists to check, if a model account exists 2020-12-19 18:07:30 +01:00
0xb00bface fb58be47bb Normalize Cam4 model URLs in setUrl 2020-12-19 18:06:55 +01:00
0xb00bface b5640d932f Set version to 3.10.10 2020-12-19 17:46:15 +01:00
0xb00bface a3ffa7a71e Improve error handling and set timeouts in the Cam4 websocket 2020-12-19 17:41:44 +01:00
0xb00bface 3d076cdde6 Improve logging 2020-12-19 17:41:03 +01:00
0xb00bface ae3726d906 Improve logging 2020-12-19 15:50:24 +01:00
0xb00bface 49469d8987 Determine online state of Cam4 models through the chat websocket 2020-12-19 15:47:44 +01:00
0xb00bface f730f95026 Also use the model page to detect the online state 2020-12-17 20:41:06 +01:00
0xb00bface 809d86f5a2 Extend regex to support more model URLs 2020-12-17 18:49:08 +01:00
0xb00bface 04ee553c1a Set version to 3.10.9 2020-12-15 19:31:29 +01:00
0xb00bface 2f0ef47acf Add more category tabs for CamSoda 2020-12-14 21:28:43 +01:00
0xb00bface d50ca02374 Add online state "off" to mapOnlineState() 2020-12-13 02:54:01 +01:00
0xb00bface ff273efedc Set version to 3.10.8 2020-12-12 22:27:10 +01:00
0xb00bface 1f07cea343 Add more online states to mapOnlineState() 2020-12-12 21:45:32 +01:00
0xb00bface 2eacbae228 Fix Stripchat recordings 
For some models the recording didn't start, even if they were online and
publicly visible in the browser. We now use a different JSON object to
determine, which resolutions are available
 2020-12-12 21:06:38 +01:00
0xb00bface cdaeaa746b Remove state from Remux post-processor 
Post-processors have to be thread safe and can't have any state
 2020-12-12 16:31:36 +01:00
0xb00bface 605269b4a0 Add setting to switch FFmpeg logging on / off 2020-12-12 15:22:10 +01:00
0xb00bface 5020f9f06d Update version to 3.10.7 2020-12-06 20:49:59 +01:00
0xb00bface 7d3e65fc14 Add parameters to the macOS browser command 
Add parameters to the open command, so that it waits for the process to
end. Otherwise the process returns immediately and causes ctbrec to go
on even though the login process didn't run in the browser.

Furthermore we now pass on the config dir for the minimal browser as a
command line argument
 2020-12-06 18:40:12 +01:00
0xb00bface 281d70d29b Store minimal browser config in ctbrec's config dir 2020-12-06 17:59:56 +01:00
0xb00bface 5be7fcc2ae Add clipboard monitoring for model URLs 2020-12-06 15:34:48 +01:00