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

822 Commits

Author SHA1 Message Date
0xb00bface 12899cac4c Fix bug in precondition check, which caused recordings to get restarted 
The bug occured when model groups were used in combination with
priorities.
 2021-06-04 15:49:47 +02:00
0xb00bface 0b25c68bdb Improve Chaturbate search 2021-06-04 11:37:58 +02:00
0xb00bface 939758403e Add login for xLoveCam 
The login is not quite working. Probably something with the password
encryption or the fnv hash
 2021-05-29 20:41:35 +02:00
0xb00bface 804d7b0f52 Add config panel for XloveCam 2021-05-29 17:44:11 +02:00
0xb00bface 3c71624f38 Add login, follow and unfollow and FollowedTab for Amateur.TV 2021-05-29 17:39:05 +02:00
0xb00bface 341846e94e Improve behaviour of getOnlineState for XloveCam 2021-05-24 20:34:25 +02:00
0xb00bface 1f9dcf1ca4 Merge branch 'amatv' into dev 
# Conflicts:
#	client/src/main/java/ctbrec/ui/SiteUiFactory.java
 2021-05-24 16:22:08 +02:00
0xb00bface 5db1e3d4d2 Basic support for XloveCam 2021-05-23 22:56:01 +02:00
0xb00bface d44fc58bf2 Fix display of resolution tag for amateur.tv 2021-05-23 16:56:14 +02:00
0xb00bface 436272f5ed Add basic support for Amateur.tv 2021-05-22 09:41:19 +02:00
0xb00bface 3749b1ee77 Add .ts file extensions for segments if it is missing 2021-05-22 09:40:35 +02:00
0xb00bface fda65fdf2a Add GZIP support for Flirt4Free HTTP requests 2021-05-16 19:38:12 +02:00
0xb00bface 10bc681da8 Set version to 4.3.1 2021-05-16 11:40:09 +02:00
0xb00bface 5ef448fa14 Fix bug in placeholder replacement 2021-05-16 11:29:56 +02:00
0xb00bface 7d23ebccfe Code cleanup 2021-05-14 14:42:16 +02:00
0xb00bface bc72aca69e Add more model group relatedfunctionality 2021-05-14 12:13:48 +02:00
0xb00bface 0c4f37f950 Add a lot of model groups tweaks 2021-05-13 16:28:06 +02:00
0xb00bface ae43ecf13e Fix unit test 2021-05-13 13:30:50 +02:00
0xb00bface c3d0fb3247 Set version to 4.3.0 2021-05-13 13:26:42 +02:00
0xb00bface ba21dd2aeb Add model group implementation for client server setup 2021-05-13 13:19:32 +02:00
0xb00bface c49a7db192 Add mechanism to specify fallback values in the pp variables 2021-05-09 21:50:11 +02:00
0xb00bface 9bb2d5d593 Add dialog to edit model groups 2021-05-09 18:38:57 +02:00
0xb00bface 0358a35a84 Add possibility to group models through a dialog 2021-05-09 12:14:03 +02:00
0xb00bface d52b728c1c Introduce new PostProcessingContext to pass around post-processing 
related objects
 2021-05-09 12:14:03 +02:00
0xb00bface 4fd7b7ddd0 First kind of working model groups 
# Conflicts:
#	common/src/main/java/ctbrec/AbstractModel.java
#	common/src/main/java/ctbrec/Model.java
#	common/src/main/java/ctbrec/ModelGroup.java
#	common/src/main/java/ctbrec/ModelGroupEntry.java
#	common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
#	common/src/main/java/ctbrec/recorder/Recorder.java
#	common/src/main/java/ctbrec/recorder/RemoteRecorder.java
 2021-05-09 12:14:03 +02:00
0xb00bface 958cbca6fa Update version to 4.2.1 2021-05-09 11:20:01 +02:00
0xb00bface a5e047124e Improve Showup websocket error handling 2021-05-09 11:11:10 +02:00
0xb00bface 3dddd91945 Add first implementation of Showup WEBRTC download 2021-05-08 19:17:33 +02:00
0xb00bface 47469c8aea Avoid swallowing of exceptions by catching them all 2021-05-08 19:11:11 +02:00
0xb00bface c96138ed6e Add getter for model 2021-05-08 19:10:21 +02:00
0xb00bface f366b9c5e9 Set version to 4.2.0 2021-05-04 17:57:25 +02:00
0xb00bface 127d555c67 Fix Cam4 unfollow 2021-04-30 14:16:15 +02:00
0xb00bface 0ad5e8ce87 Reduce log level for some Cam4Model log statements 2021-04-30 13:57:04 +02:00
0xb00bface 73c5cccc51 Set default of "minimize to tray" to false 2021-04-18 16:48:31 +02:00
0xb00bface 8e2999241f Avoid saving config during initialization of the GUI 2021-04-18 12:05:05 +01:00
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