6fb1ee5153
Fix boolean condition for "rerun pp" context menu entry
2019-12-21 17:52:50 +01:00
a4b805c038
Set version to 3.0.0
2019-12-21 14:33:45 +01:00
4eeb101cbb
Fix recording downloads from server to client
2019-12-21 14:30:57 +01:00
e37c869695
Merge branch 'dev' into mp4-streaming
2019-12-17 21:27:16 +01:00
e734d46e9c
Add gitattributes and run initial normalization
2019-12-17 21:13:18 +01:00
b9f463d0dd
Bump version to 2.3.0
2019-12-08 19:04:22 +01:00
034fe81081
Use FFmpeg to merge HLS segments
2019-12-07 16:58:56 +01:00
eba7b085b8
Add FFmpeg to assembly
...
- Add FFmpeg to the assembly
- Remove assembly descriptors without JRE
2019-12-07 13:41:25 +01:00
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
98c1731c8e
Add DASH download logger entry to logback config
2019-12-07 11:56:12 +01:00
d8d0e4d5af
Add ffmpeg static binaries dir to gitignore
2019-12-07 11:55:30 +01:00
00ea43c8b3
Move HLS related classes ot own package
2019-11-30 16:40:01 +01:00
43dfc4e59c
Set versions in maven POMs
2019-11-23 17:14:44 +01:00
011e8c2f29
Improve thread interrupt and lock handling
2019-11-23 17:13:27 +01:00
84a02d7432
Use liveState to determine, if a model is online
2019-09-21 12:50:05 +02:00
7319b6251a
Fix favorites page for Streamate
...
The URL and JSON response for favorites had changed
2019-09-21 12:00:12 +02:00
372fce2899
Update the RunningTheServer page
2019-08-10 20:24:27 +02:00
7c29bba16e
Set version to 2.2.0
2019-08-10 18:25:40 +02:00
f12a20a15e
Add support for TLS and changing the context path
2019-08-10 17:45:13 +02:00
8450ddd98c
Increase version to 2.1.0
2019-07-27 18:27:54 +02:00
bc724b2f42
Add setting to switch on/off the server webinterface
2019-07-27 17:55:42 +02:00
88040e9a0b
Disable MyFreeCams for the time being
2019-07-21 10:46:46 +02:00
1db79541ff
Add web interface for the server
2019-07-21 10:39:00 +02:00
ef19e04751
Fix NPE in DirectorySelectionBox
2019-07-05 18:09:50 +02:00
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
798f950a95
Refresh model online state before switching resolutions
2019-06-11 19:59:11 +02:00
367bec664c
Sleep 100ms between open and close checks for the preview
2019-06-11 19:58:46 +02:00
ddbd8de900
Fix Flirt4Free thumb overviews and recording
2019-06-08 10:34:44 +02:00
3101e1b36d
Update login not working section
2019-06-07 21:33:14 +02:00
ca17d4758c
Increase version to 2.0.1
2019-06-07 21:24:12 +02:00
e08d895054
Add login not working section
2019-06-03 21:27:27 +02:00
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
d5f2f043e4
Fix download filename
2019-06-01 17:26:33 +02:00
a41223397d
Make use of the Dialogs class instead of creation own alerts
2019-06-01 15:33:20 +02:00
9302dffd7f
Set version to 2.0.0
2019-06-01 15:32:47 +02:00
4104b5990c
Fix Camsoda JSON parsing
2019-06-01 15:32:19 +02:00
f11fcf7ca1
Rewrite recording code for remote recording
2019-06-01 12:12:46 +02:00
0f3d0b6337
Rewrite recording code for local recording
...
Remote recording is TBD
2019-05-31 20:00:07 +02:00
8d3f2da18b
Apply stylesheet to all dialogs
2019-05-01 10:49:15 +02:00
f8c5470fba
Add example script by @electrotek@mastodon.cloud
2019-04-22 17:42:15 +02:00
f4b7141a63
Increase version to 1.21.1
2019-04-20 16:03:04 +02:00
b854455f8a
Increase version to 1.21.0
2019-04-20 14:27:01 +02:00
80071a1eb4
Add Flirt4Free config UI
2019-04-20 12:50:41 +02:00
204eb99b29
Implement follow/unfollow for Flirt4Free
2019-04-16 19:51:57 +02:00
f1d11c07b5
Merge branch 'dev' into flirt4free
2019-04-15 16:02:35 +02:00
8eb5f3f33d
Set version to 1.20.0
2019-04-14 20:38:32 +02:00
5e8604d38b
Merge branch 'dev' into flirt4free
2019-04-14 20:00:53 +02:00
38cacc563c
Add hyperlinks
2019-04-14 19:56:09 +02:00
1a33c3d92d
Add section how to run several instances
2019-04-14 19:53:16 +02:00
c672750d10
Add example script by @uo0Evx99@mastodon.cloud
2019-04-14 19:43:50 +02:00
165e49d8e7
Add the post-processing documentation
2019-04-14 18:12:58 +02:00
9037d8544d
Add documentation for the configuration files
2019-04-14 17:57:32 +02:00
74f727bc12
Set insets of buttons to 5
2019-04-13 16:24:24 +02:00
ea310e5970
Merge branch 'dev' into flirt4free
2019-04-13 15:25:06 +02:00
280b0a30b7
Set insets of buttons in the top bar to 5
2019-04-13 14:32:05 +02:00
a763162963
Add tab to open the help
2019-04-13 14:22:52 +02:00
15bfe0f44f
Add basic functionality for Flirt4Free
2019-04-12 21:57:53 +02:00
2635246bef
Sort ignore list by model name
2019-04-11 16:22:31 +02:00
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
d6482c5558
Enable multi-selection by ctrl and not shift
2019-04-11 15:24:39 +02:00
0ae139e17a
Add button/dialog to settings to edit the ignore list
2019-04-11 15:18:46 +02:00
9696edd002
Apply application stylesheets to custom dialogs
2019-04-11 14:38:09 +02:00
62c6f9a885
Remove notes from config, if new note is an empty string
2019-04-11 14:00:27 +02:00
715b312774
Add more documentation
2019-04-09 18:31:30 +02:00
f0bf6c5d7c
Add index and search to documentation app
2019-04-09 12:06:38 +02:00
482a7289b7
Add missing files
2019-04-08 15:47:18 +02:00
adf3da4aee
Add documentation server with markdown servlet
2019-04-08 15:41:09 +02:00
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
458e05d2b4
Add notes column to recorded models tab
2019-04-07 18:11:27 +02:00
fb7953e045
Add crypto wallets again
2019-04-07 17:20:16 +02:00
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
25e7c8a0ea
Add filter input to filter by model name and url
2019-04-05 13:40:08 +02:00
85b809da00
Clear search box, if escape is pressed
2019-04-05 13:39:41 +02:00
73221ce881
Set version to 1.19.1
2019-04-04 19:00:49 +02:00
dd1a2c1cc8
Use the proper URL to retrieve the news toots
2019-04-04 18:55:36 +02:00
055de8b653
Update bundled Java to version 12
2019-04-04 18:40:30 +02:00
f5a302337f
Don't show previews, if disabled
2019-04-03 21:00:20 +02:00
1dd432dbd9
Add base URL setting for Bongacams
2019-03-05 17:01:42 +01:00
71599c7156
Get the 50 latest toots instead of 20
2019-02-28 18:24:19 +01:00
14b2911651
Increase version to 1.19.0
2019-02-19 18:57:40 +01:00
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
fba3a72167
Disable concurrent download settings for server mode
2019-02-13 20:46:43 +01:00
70bb052c94
Improve layout and look of StatusPane
2019-02-13 15:29:43 +01:00
0a58b91fec
Don't show replies, but only new status
2019-02-13 12:23:19 +01:00
2b82215678
Use pastebin URLs for the changelog and update check
2019-02-11 15:43:17 +01:00
9245ab6592
Add tooltip for max resolution
2019-02-06 20:53:05 +01:00
351560079b
Add concurrent recordings setting to settings tab
2019-02-05 15:25:56 +01:00
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
76f4583ebc
Rename Recorder.isRecording to Recorder.isTracked
2019-02-05 14:45:44 +01:00
198a9c6893
Rename Recorder.getModelsRecording to Recorder.getModels
2019-02-05 14:44:21 +01:00
89f2319345
Add 5min options for split recordings
2019-02-05 12:43:57 +01:00
6ee666a0b1
Add news tab, which shows status updates from mastodon
2019-01-31 16:43:48 +01:00
80e577db7c
Add menu entry to regenerate the playlist
2019-01-31 15:07:42 +01:00
2616d318c0
Deactivate validation if control is disabled
2019-01-31 14:16:41 +01:00
6e58dd6be5
Implement follow/unfollow for BongaCams
2019-01-29 16:28:07 +01:00
4f541c0570
Increased version to 1.18.0
2019-01-29 14:25:54 +01:00
e7feaad11c
Merge branch 'dev' into fc2
2019-01-29 13:05:43 +01:00
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
9f13a54eb6
Remove misleading log message
2019-01-28 16:20:07 +01:00
182a9e079e
Update active recording counter, when a MODEL_ONLINE event arrives
2019-01-28 13:32:24 +01:00
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
16752b892c
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/sites/jasmin/LiveJasminHttpClient.java
2019-01-24 19:16:52 +01:00
d346270da2
Show the number of active recordings in the window title
...
Use the event system to show the number of active recordings in the
window title. Requested in #155 .
2019-01-24 17:36:23 +01:00
2c67b0b75c
Merge branch 'jasmin' into dev
2019-01-24 15:52:38 +01:00
6fcdce673d
Show error message on Followed tab, if credentials are missing
2019-01-24 15:52:25 +01:00
86416e0402
Add config UI for FC2Live
2019-01-24 15:38:35 +01:00
beeaca4beb
Implement login and follow/unfollow
2019-01-24 15:24:05 +01:00
16fdee2a2c
Merge branch 'dev' into fc2
...
# Conflicts:
# client/src/main/java/ctbrec/ui/ExternalBrowser.java
2019-01-23 17:56:20 +01:00
e8572434a9
Set version to 1.17.1
2019-01-23 17:41:03 +01:00
b548db4a66
Adjust CamsodaUpdateService to new JSON structure
2019-01-23 17:40:20 +01:00
44bc5d02aa
Add setting to change the base URL for LiveJasmin
...
This setting is for users, which are blocked for the main domain, like
users behind the great chinese wall.
2019-01-23 16:25:02 +01:00
a69b0926f0
Remove NotLoggedInException
...
This exception is not used anymore
2019-01-23 16:23:07 +01:00
0e9ae32161
Merge branch 'master' into dev
2019-01-23 14:24:34 +01:00
64c82748dc
Count the websocket uses wth AtomicInteger
2019-01-22 22:42:46 +01:00
fc6aeff94a
Implemt special player handling for fc2live
2019-01-21 17:58:59 +01:00
7b2f30474a
Make sure the reader thread is ready before sending any commands
2019-01-21 15:34:18 +01:00
3a83943130
Let SiteUi launch the player for a model stream
...
This is done, because there might be some special conditions for the
player to work. For example on fc2live a websocket has to be open while
the player is running. The SiteUI can handle these cases transparently.
2019-01-21 15:31:13 +01:00
6262d50f74
Log browser output
2019-01-20 17:58:10 +01:00
55fc6729f8
Merge branch 'dev' into fc2
...
# Conflicts:
# client/src/main/java/ctbrec/ui/CamrecApplication.java
# client/src/main/java/ctbrec/ui/SiteUiFactory.java
2019-01-20 13:51:04 +01:00
9cf5e4c41c
Don't show login, if credentails are missing
2019-01-19 17:45:58 +01:00
11f2a3ef8d
Increase version to 1.17.0
2019-01-19 16:06:50 +01:00
e2d3ef264e
Add proxy support for the external browser
2019-01-19 15:31:13 +01:00
f7ca2a1eab
Changed LiveJasmin beta warning a bit
...
Since the HLS downloads suddenly work the warning now only states, that
you have to log in and that the previews don't work
2019-01-18 16:30:16 +01:00
ceb65f0ff2
Logging
2019-01-17 12:20:29 +01:00
dd2b8041d7
Add some text to explain, that LiveJasmin is not fully functional
2019-01-15 17:10:56 +01:00
d46e4be450
Introduced tab for LiveJasmin to force logins
2019-01-12 17:25:53 +01:00
9ceec96195
Make sure, the external browser lock gets released
2019-01-12 17:25:13 +01:00
f24959b76e
Switch token data type to double
...
LiveJasmin and maybe other sites use a more currency like token system
2019-01-10 14:22:26 +01:00
bf6b715642
Login every 30 min to LiveJasmin so that the session does not expire
2019-01-09 20:35:31 +01:00
f2ac9e3657
Show error dialog if login fails
2019-01-09 15:12:21 +01:00
dc946e407f
Merge branch 'dev' into jasmin
2019-01-08 14:33:16 +01:00
a6709bd6db
Introduce external browser for logins
...
Since the JavaFX integrated browser does not work reliably for recaptcha and in general does not behave like standard browsers, I now use an external browser for the logins. The dependency to javafx-web has been removed.
The external browser is based on electron, which uses chromium as internal browser. The implementation can be found at https://github.com/0xboobface/ctbrec-minimal-browser
The browser is a minimal browser, which only shows the web page content without any other controls. It is launched by ctbrec in a new process and remote controlled over a socket connection. I first tried to control it via
stdin/stdout, but it turns out, that stdin is not supported by electron on windows.
2019-01-08 14:26:22 +01:00
3f0ecf4805
Fix Streamate favorites tab
2019-01-08 14:17:26 +01:00
77753bd377
Use TextArea and Okhttp to show the chnagelog
...
Instead of using a WebView use TextArea and Okhttp, so that we can get
rid of javafx-web
2019-01-05 16:38:48 +01:00
7483c8505a
Merge branch 'dev' into fc2
2018-12-23 13:58:50 +01:00
d29672bb21
Remove debug output
2018-12-23 13:58:08 +01:00
9b764ec8ed
Sort by popularity
2018-12-22 22:33:24 +01:00
32099eec46
Add a few more pages
2018-12-22 22:33:16 +01:00
c364250440
Add follow / unfollow for livejasmin
2018-12-22 20:53:41 +01:00
2425a9dc60
Add websocket download
...
This is the first version with working downloads for SD and HD. These
dowloads only work, if you are logged in. So at the moment you have to set the
session ID in the settings to make this work. The session ID can be copied
from a valid session in a browser.
2018-12-22 19:44:45 +01:00
f05d9b32e2
Add CSV export for model table
...
Also cache the data in a file to bootstrap the table on startup
2018-12-19 17:44:10 +01:00
db5b6bdf5b
Add a setting for the thumbnail overview update interval
...
Implements #123
2018-12-19 13:37:31 +01:00
4f3fd8a677
Add classes for LiveJasmin
2018-12-19 12:57:44 +01:00
0c35f4c219
Merge branch 'dev' into fc2
2018-12-17 23:01:21 +01:00
32807a2fde
Let models create their download
...
Add createDownload to Model. This method is called by the recorder to create
and then start a download. It is a method of Model so that each site and
each download can create a specialized download.
2018-12-17 22:06:13 +01:00
75fedfcddd
Disable minimum length in remote mode
2018-12-17 18:28:29 +01:00
2a1dc77a89
Increase version number to 1.16.0
2018-12-17 17:53:53 +01:00
e362980028
Make live previews experimental
...
Add a setting to toggle live previews. When switched off, the thumbnails
won't show the trigger and the recording table won't show the column.
I did this, because the MediaPlayer sometimes bugs out. It then opens a
lot of connections and further tries to open a stream end in an
exception in the playlist parser.
2018-12-17 17:11:45 +01:00
47d8101ce8
Avoid NPE in onError
2018-12-17 15:21:36 +01:00
a0a083aaf6
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/io/HttpClient.java
2018-12-17 13:05:11 +01:00
0xboobface