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

354 Commits

Author SHA1 Message Date
0xboobface 4eeb101cbb Fix recording downloads from server to client 2019-12-21 14:30:57 +01:00
0xboobface e37c869695 Merge branch 'dev' into mp4-streaming 2019-12-17 21:27:16 +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 034fe81081 Use FFmpeg to merge HLS segments 2019-12-07 16:58:56 +01:00
0xboobface eba7b085b8 Add FFmpeg to assembly 
- Add FFmpeg to the assembly
- Remove assembly descriptors without JRE
 2019-12-07 13:41:25 +01:00
0xboobface 1c64b82deb Add providers for MFC streams sources 
Since MFC uses different streaming technologies, the stream sources have
to be determined differently. This is now done in dedicated
StreamSourceProvider classes.
 2019-12-07 12:00:05 +01:00
0xboobface 98c1731c8e Add DASH download logger entry to logback config 2019-12-07 11:56:12 +01:00
0xboobface d8d0e4d5af Add ffmpeg static binaries dir to gitignore 2019-12-07 11:55:30 +01:00
0xboobface 00ea43c8b3 Move HLS related classes ot own package 2019-11-30 16:40:01 +01:00
0xboobface 43dfc4e59c Set versions in maven POMs 2019-11-23 17:14:44 +01:00
0xboobface 011e8c2f29 Improve thread interrupt and lock handling 2019-11-23 17:13:27 +01:00
0xboobface 84a02d7432 Use liveState to determine, if a model is online 2019-09-21 12:50:05 +02:00
0xboobface 7319b6251a Fix favorites page for Streamate 
The URL and JSON response for favorites had changed
 2019-09-21 12:00:12 +02:00
0xboobface 372fce2899 Update the RunningTheServer page 2019-08-10 20:24:27 +02: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 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 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 ef19e04751 Fix NPE in DirectorySelectionBox 2019-07-05 18:09:50 +02:00
0xboobface 2bedb6497a Revert switch to JSON parsing 
The switch to parse the JSON array at the end of the page is not
reliable because the page does not always contain the array.
 2019-06-29 18:08:45 +02:00
0xboobface 798f950a95 Refresh model online state before switching resolutions 2019-06-11 19:59:11 +02:00
0xboobface 367bec664c Sleep 100ms between open and close checks for the preview 2019-06-11 19:58:46 +02:00
0xboobface ddbd8de900 Fix Flirt4Free thumb overviews and recording 2019-06-08 10:34:44 +02:00
0xboobface 3101e1b36d Update login not working section 2019-06-07 21:33:14 +02:00
0xboobface ca17d4758c Increase version to 2.0.1 2019-06-07 21:24:12 +02:00
0xboobface e08d895054 Add login not working section 2019-06-03 21:27:27 +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 d5f2f043e4 Fix download filename 2019-06-01 17:26:33 +02:00
0xboobface a41223397d Make use of the Dialogs class instead of creation own alerts 2019-06-01 15:33:20 +02:00
0xboobface 9302dffd7f Set version to 2.0.0 2019-06-01 15:32:47 +02:00
0xboobface 4104b5990c Fix Camsoda JSON parsing 2019-06-01 15:32:19 +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 8d3f2da18b Apply stylesheet to all dialogs 2019-05-01 10:49:15 +02:00
0xboobface f8c5470fba Add example script by @electrotek@mastodon.cloud 2019-04-22 17:42:15 +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 80071a1eb4 Add Flirt4Free config UI 2019-04-20 12:50:41 +02:00
0xboobface 204eb99b29 Implement follow/unfollow for Flirt4Free 2019-04-16 19:51:57 +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 5e8604d38b Merge branch 'dev' into flirt4free 2019-04-14 20:00:53 +02:00
0xboobface 38cacc563c Add hyperlinks 2019-04-14 19:56:09 +02:00
0xboobface 1a33c3d92d Add section how to run several instances 2019-04-14 19:53:16 +02:00
0xboobface c672750d10 Add example script by @uo0Evx99@mastodon.cloud 2019-04-14 19:43:50 +02:00
0xboobface 165e49d8e7 Add the post-processing documentation 2019-04-14 18:12:58 +02:00
0xboobface 9037d8544d Add documentation for the configuration files 2019-04-14 17:57:32 +02:00
0xboobface 74f727bc12 Set insets of buttons to 5 2019-04-13 16:24:24 +02:00
0xboobface ea310e5970 Merge branch 'dev' into flirt4free 2019-04-13 15:25:06 +02:00
0xboobface 280b0a30b7 Set insets of buttons in the top bar to 5 2019-04-13 14:32:05 +02:00
0xboobface a763162963 Add tab to open the help 2019-04-13 14:22:52 +02:00
0xboobface 15bfe0f44f Add basic functionality for Flirt4Free 2019-04-12 21:57:53 +02:00
0xboobface 2635246bef Sort ignore list by model name 2019-04-11 16:22:31 +02:00
0xboobface 348019d8e0 Add warning to max resolution 
Add the warning to the tooltip: Caution: If the resolution is unknown,
ctbrec will not record the stream!
 2019-04-11 15:33:08 +02:00
0xboobface d6482c5558 Enable multi-selection by ctrl and not shift 2019-04-11 15:24:39 +02:00
0xboobface 0ae139e17a Add button/dialog to settings to edit the ignore list 2019-04-11 15:18:46 +02:00
0xboobface 9696edd002 Apply application stylesheets to custom dialogs 2019-04-11 14:38:09 +02:00
0xboobface 62c6f9a885 Remove notes from config, if new note is an empty string 2019-04-11 14:00:27 +02:00
0xboobface 715b312774 Add more documentation 2019-04-09 18:31:30 +02:00
0xboobface f0bf6c5d7c Add index and search to documentation app 2019-04-09 12:06:38 +02:00
0xboobface 482a7289b7 Add missing files 2019-04-08 15:47:18 +02:00
0xboobface adf3da4aee Add documentation server with markdown servlet 2019-04-08 15:41:09 +02:00
0xboobface 601669fdd6 Added menu entry to ignore models 
Ignored models are not displayed in the thumb overview tab. This is
useful, if you don't like a model and want to get rid of it for good
 2019-04-07 18:43:06 +02:00
0xboobface 458e05d2b4 Add notes column to recorded models tab 2019-04-07 18:11:27 +02:00
0xboobface fb7953e045 Add crypto wallets again 2019-04-07 17:20:16 +02:00
0xboobface 9647f1160f Fix: Errors thrown by external browser 
This hopefully fixes the errors, which popped up in the external browser, because
it tried to write to a closed socket.
 2019-04-05 14:50:45 +02:00
0xboobface 25e7c8a0ea Add filter input to filter by model name and url 2019-04-05 13:40:08 +02:00
0xboobface 85b809da00 Clear search box, if escape is pressed 2019-04-05 13:39:41 +02:00
0xboobface 73221ce881 Set version to 1.19.1 2019-04-04 19:00:49 +02:00
0xboobface dd1a2c1cc8 Use the proper URL to retrieve the news toots 2019-04-04 18:55:36 +02:00
0xboobface 055de8b653 Update bundled Java to version 12 2019-04-04 18:40:30 +02:00
0xboobface f5a302337f Don't show previews, if disabled 2019-04-03 21:00:20 +02:00
0xboobface 1dd432dbd9 Add base URL setting for Bongacams 2019-03-05 17:01:42 +01:00
0xboobface 71599c7156 Get the 50 latest toots instead of 20 2019-02-28 18:24:19 +01:00
0xboobface 14b2911651 Increase version to 1.19.0 2019-02-19 18:57:40 +01:00
0xboobface e1eeb830da Add getSanitizedName to Model 
This method provides returns a name, which is safe to use with
filesystem I/O. Fc2Model returns the model ID for this.
 2019-02-19 15:28:52 +01:00
0xboobface fba3a72167 Disable concurrent download settings for server mode 2019-02-13 20:46:43 +01:00
0xboobface 70bb052c94 Improve layout and look of StatusPane 2019-02-13 15:29:43 +01:00
0xboobface 0a58b91fec Don't show replies, but only new status 2019-02-13 12:23:19 +01:00
0xboobface 2b82215678 Use pastebin URLs for the changelog and update check 2019-02-11 15:43:17 +01:00
0xboobface 9245ab6592 Add tooltip for max resolution 2019-02-06 20:53:05 +01:00
0xboobface 351560079b Add concurrent recordings setting to settings tab 2019-02-05 15:25:56 +01:00
0xboobface 097fb251cb Add getCurrentlyRecording to recorder 
This method returns the models, which are currently recorded. It is
implemented as default method, so that LocalRecorder and RemoteRecorder
don't have to implement the same logic.
 2019-02-05 15:07:56 +01:00
0xboobface 76f4583ebc Rename Recorder.isRecording to Recorder.isTracked 2019-02-05 14:45:44 +01:00
0xboobface 198a9c6893 Rename Recorder.getModelsRecording to Recorder.getModels 2019-02-05 14:44:21 +01:00
0xboobface 89f2319345 Add 5min options for split recordings 2019-02-05 12:43:57 +01:00
0xboobface 6ee666a0b1 Add news tab, which shows status updates from mastodon 2019-01-31 16:43:48 +01:00
0xboobface 80e577db7c Add menu entry to regenerate the playlist 2019-01-31 15:07:42 +01:00
0xboobface 2616d318c0 Deactivate validation if control is disabled 2019-01-31 14:16:41 +01:00
0xboobface 6e58dd6be5 Implement follow/unfollow for BongaCams 2019-01-29 16:28:07 +01:00
0xboobface 4f541c0570 Increased version to 1.18.0 2019-01-29 14:25:54 +01:00
0xboobface e7feaad11c Merge branch 'dev' into fc2 2019-01-29 13:05:43 +01:00
0xboobface 2fe6ec0e8f Fix #156 
Make sure, that the tray icon is created only once. Also move the
notification methods from OS to DesktopIntegration.
 2019-01-28 17:26:53 +01:00
0xboobface 9f13a54eb6 Remove misleading log message 2019-01-28 16:20:07 +01:00
0xboobface 182a9e079e Update active recording counter, when a MODEL_ONLINE event arrives 2019-01-28 13:32:24 +01:00
0xboobface 70a9d65e48 Fix login for FC2Live 
FC2Live sends cookies with value "deleted" to invalidate previously set values. In the same request
they send new values, too. That confused OkHttp. We now use a custom cookie jar for FC2Live, which
ignores cookies with the value "deleted"
 2019-01-27 14:05:45 +01:00
0xboobface 16752b892c Merge branch 'dev' into fc2 
# Conflicts:
#	common/src/main/java/ctbrec/sites/jasmin/LiveJasminHttpClient.java
 2019-01-24 19:16:52 +01:00