a69b0926f0
Remove NotLoggedInException
...
This exception is not used anymore
2019-01-23 16:23:07 +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
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
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
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
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
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
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
a0a083aaf6
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/io/HttpClient.java
2018-12-17 13:05:11 +01:00
465e417b6c
Ignore models without username in JSON response
...
Fix for #120
There are objects in the JSON response, which don't look like regular model
entries. If an object doesn't have a username, ignore it.
2018-12-15 13:18:15 +01:00
1ce9a111a9
Add tipping for Streamate
...
Tipping does not work, yet. The server returns success: false. I don't
know, what the parameters have to look like
2018-12-14 23:37:55 +01:00
4d7409f443
Implement follow/unfollow and login with cookies
2018-12-14 20:25:57 +01:00
c7e07b4b26
Implement login and favorites tab
2018-12-14 17:36:24 +01:00
6b52906811
Add configuration ui for the credentials
2018-12-14 15:51:15 +01:00
461e65ed84
Switch to much simpler JSON api
2018-12-14 14:58:12 +01:00
64c60eaeaa
Add determination of stream url and stream sources
2018-12-14 02:39:07 +01:00
52cdf8d601
Add classes and first code for Streamate
2018-12-13 23:48:16 +01:00
066cb52106
Fix JSON parsing for BongaCams
2018-12-13 16:16:46 +01:00
540e8a8466
Fix JSON parsing for CamSoda
2018-12-13 16:15:08 +01:00
672c133ee4
Rename "Record" to "Start Recording"
...
... to be consistent with other views
2018-12-12 18:29:34 +01:00
60da66139e
Make use of new actions
2018-12-12 18:16:49 +01:00
a68341de82
Add actions to MFC's table view
2018-12-12 18:08:39 +01:00
f32990b9d7
Created action classes for actions on Recording tab
2018-12-12 16:52:29 +01:00
c478f6b0f1
Make login methods synchronized
...
Add synchronized modifier to the login methods, so that only one thread
at a time tries to login. All the following threads then should be able
to use the session cookies
2018-12-12 12:48:45 +01:00
a5ec00c936
Add table for MFC which contains all models
2018-12-11 21:59:32 +01:00
bb3de83453
Logout and delete cookies when credentials are changed
2018-12-10 18:37:04 +01:00
2dc5fd4581
Add Event and EventReaction classes
2018-12-06 17:39:33 +01:00
b50df194a0
Move settings to own package
2018-12-06 17:38:10 +01:00
b100f107d4
Move site activation checkbox to their config ui
2018-12-06 14:16:10 +01:00
9f19b2c1fa
Merge branch 'dev' into notify
2018-12-05 16:08:55 +01:00
e6476e95ec
Add setting to ignore the upscaled video stream on MFC
2018-12-05 16:08:44 +01:00
42177b4399
Add enum to Model for the online states
2018-12-05 15:51:21 +01:00
6b4d320bc2
Add setting to set the base URL for MFC
2018-12-02 22:35:12 +01:00
f0edfb167c
Added support for display names from Camsoda
2018-12-01 16:34:09 +01:00
56291cb97f
Add support for display names for BongaCams
2018-12-01 15:29:56 +01:00
7192856c87
Add setting for chaturbate base URL
2018-12-01 14:17:03 +01:00
e5ff778d6b
Write config immediately after a value changed
2018-11-25 21:15:25 +01:00
7133283032
Start implementation for FC2Live
2018-11-19 23:20:39 +01:00
cda330ddbd
Split up project into client, server, common and master
2018-11-18 22:42:13 +01:00
0xboobface