Commit Graph

156 Commits

Author SHA1 Message Date
0xboobface 58663d8e8d Adjust MVLive code to API changes 2020-06-14 15:12:51 +02:00
0xboobface 00692f991e Add UI part for MVLive
At the moment only the thumbnail overview is working. More stuff to come...
2020-06-14 15:07:54 +02:00
0xboobface f4ad1a4f61 Move ConfigUI interface from common module to client 2020-06-12 18:25:28 +02:00
0xboobface bd48d6bf9c Set version to 3.8.0 2020-06-12 18:10:56 +02:00
0xboobface acd6126619 Add "New" tab to each site where it was missing 2020-06-07 13:53:54 +02:00
0xboobface 9eea66d94f Remove the uid field from ShowupModel 2020-05-20 19:37:01 +02:00
0xboobface 33a0094b19 Adjust to Stripchat API changes 2020-05-20 18:17:46 +02:00
0xboobface 1a5c32167e Preparation for Showup login 2020-05-16 21:30:25 +02:00
0xboobface 6c85a2a493 First working version of Showup.tv 2020-05-16 16:28:44 +02:00
0xboobface a37a018159 Remove outdated settings for MFC 2020-04-13 19:43:33 +02:00
0xboobface ae6fa229e7 Add user-agent agent header to every http request in MFC classes 2020-04-13 18:42:57 +02:00
0xboobface 979c8b0a91 Add Girls HD tab for Stripchat 2020-03-28 13:08:24 +01:00
0xboobface 915be1d4fc Save column order in tables 2020-03-22 13:54:31 +01:00
0xboobface dc30f7da51 Increase models per page for Streamate favorites 2020-03-20 15:18:26 +01:00
0xboobface e4b9da7685 First working implementation for Stripchat 2020-02-23 18:47:37 +01:00
0xboobface e03dd3aabe Extend the beta description text 2020-02-16 15:52:22 +01:00
0xboobface b18a32ede3 Fix LiveJasmin followed tab 2020-02-16 13:28:33 +01:00
0xboobface 18669a9c43 Fix Streamate
Streamate introduced a CSRF token, which has to be sent in the HTTP
header.
2020-01-26 18:33:13 +01:00
0xboobface 5083d77ffe Move tab related stuff to own package 2020-01-26 15:07:30 +01:00
0xboobface b12f3e5789 Add setting to switch between DASH and HLS for MFC 2020-01-03 12:27:06 +01:00
0xboobface e14296bc1b Add a column, which shows, if a model uses webrtc 2020-01-03 12:25:33 +01:00
0xboobface abef15a5f7 Code cleanup 2019-12-31 12:53:50 +01:00
0xboobface 87b0ce0d21 Use constants from HttpConstants 2019-12-27 15:14:55 +01:00
0xboobface f3a13a6f06 Fix CamSoda downloads
Some models now have a different stream URL. ctbrec has to distiguish
between the old and the new URLs
2019-12-27 13:51:28 +01:00
0xboobface fde24e80ea Use JSON again to parse the models 2019-12-21 21:04:49 +01:00
0xboobface 45d18c754a Fix followed page for MFC 2019-12-21 19:54:49 +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 00ea43c8b3 Move HLS related classes ot own package 2019-11-30 16:40:01 +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 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 ddbd8de900 Fix Flirt4Free thumb overviews and recording 2019-06-08 10:34:44 +02:00
0xboobface 4104b5990c Fix Camsoda JSON parsing 2019-06-01 15:32:19 +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 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 15bfe0f44f Add basic functionality for Flirt4Free 2019-04-12 21:57:53 +02:00
0xboobface 1dd432dbd9 Add base URL setting for Bongacams 2019-03-05 17:01:42 +01:00
0xboobface 6e58dd6be5 Implement follow/unfollow for BongaCams 2019-01-29 16:28:07 +01:00
0xboobface 9f13a54eb6 Remove misleading log message 2019-01-28 16:20:07 +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
0xboobface 2c67b0b75c Merge branch 'jasmin' into dev 2019-01-24 15:52:38 +01:00
0xboobface 6fcdce673d Show error message on Followed tab, if credentials are missing 2019-01-24 15:52:25 +01:00
0xboobface 86416e0402 Add config UI for FC2Live 2019-01-24 15:38:35 +01:00
0xboobface beeaca4beb Implement login and follow/unfollow 2019-01-24 15:24:05 +01:00
0xboobface 16fdee2a2c Merge branch 'dev' into fc2
# Conflicts:
#	client/src/main/java/ctbrec/ui/ExternalBrowser.java
2019-01-23 17:56:20 +01:00
0xboobface b548db4a66 Adjust CamsodaUpdateService to new JSON structure 2019-01-23 17:40:20 +01:00
0xboobface 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
0xboobface a69b0926f0 Remove NotLoggedInException
This exception is not used anymore
2019-01-23 16:23:07 +01:00
0xboobface 64c82748dc Count the websocket uses wth AtomicInteger 2019-01-22 22:42:46 +01:00
0xboobface fc6aeff94a Implemt special player handling for fc2live 2019-01-21 17:58:59 +01:00
0xboobface 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
0xboobface 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
0xboobface 9cf5e4c41c Don't show login, if credentails are missing 2019-01-19 17:45:58 +01:00
0xboobface e2d3ef264e Add proxy support for the external browser 2019-01-19 15:31:13 +01:00
0xboobface 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
0xboobface dd2b8041d7 Add some text to explain, that LiveJasmin is not fully functional 2019-01-15 17:10:56 +01:00
0xboobface d46e4be450 Introduced tab for LiveJasmin to force logins 2019-01-12 17:25:53 +01:00
0xboobface 9ceec96195 Make sure, the external browser lock gets released 2019-01-12 17:25:13 +01:00
0xboobface bf6b715642 Login every 30 min to LiveJasmin so that the session does not expire 2019-01-09 20:35:31 +01:00
0xboobface f2ac9e3657 Show error dialog if login fails 2019-01-09 15:12:21 +01:00
0xboobface dc946e407f Merge branch 'dev' into jasmin 2019-01-08 14:33:16 +01:00
0xboobface 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
0xboobface 3f0ecf4805 Fix Streamate favorites tab 2019-01-08 14:17:26 +01:00
0xboobface 7483c8505a Merge branch 'dev' into fc2 2018-12-23 13:58:50 +01:00
0xboobface d29672bb21 Remove debug output 2018-12-23 13:58:08 +01:00
0xboobface 9b764ec8ed Sort by popularity 2018-12-22 22:33:24 +01:00
0xboobface 32099eec46 Add a few more pages 2018-12-22 22:33:16 +01:00
0xboobface c364250440 Add follow / unfollow for livejasmin 2018-12-22 20:53:41 +01:00
0xboobface 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
0xboobface 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
0xboobface db5b6bdf5b Add a setting for the thumbnail overview update interval
Implements #123
2018-12-19 13:37:31 +01:00
0xboobface 4f3fd8a677 Add classes for LiveJasmin 2018-12-19 12:57:44 +01:00
0xboobface a0a083aaf6 Merge branch 'dev' into fc2
# Conflicts:
#	common/src/main/java/ctbrec/io/HttpClient.java
2018-12-17 13:05:11 +01:00
0xboobface 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
0xboobface 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
0xboobface 4d7409f443 Implement follow/unfollow and login with cookies 2018-12-14 20:25:57 +01:00
0xboobface c7e07b4b26 Implement login and favorites tab 2018-12-14 17:36:24 +01:00
0xboobface 6b52906811 Add configuration ui for the credentials 2018-12-14 15:51:15 +01:00
0xboobface 461e65ed84 Switch to much simpler JSON api 2018-12-14 14:58:12 +01:00
0xboobface 64c60eaeaa Add determination of stream url and stream sources 2018-12-14 02:39:07 +01:00
0xboobface 52cdf8d601 Add classes and first code for Streamate 2018-12-13 23:48:16 +01:00
0xboobface 066cb52106 Fix JSON parsing for BongaCams 2018-12-13 16:16:46 +01:00
0xboobface 540e8a8466 Fix JSON parsing for CamSoda 2018-12-13 16:15:08 +01:00
0xboobface 672c133ee4 Rename "Record" to "Start Recording"
... to be consistent with other views
2018-12-12 18:29:34 +01:00
0xboobface 60da66139e Make use of new actions 2018-12-12 18:16:49 +01:00
0xboobface a68341de82 Add actions to MFC's table view 2018-12-12 18:08:39 +01:00
0xboobface f32990b9d7 Created action classes for actions on Recording tab 2018-12-12 16:52:29 +01:00
0xboobface 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
0xboobface a5ec00c936 Add table for MFC which contains all models 2018-12-11 21:59:32 +01:00
0xboobface bb3de83453 Logout and delete cookies when credentials are changed 2018-12-10 18:37:04 +01:00
0xboobface 2dc5fd4581 Add Event and EventReaction classes 2018-12-06 17:39:33 +01:00
0xboobface b50df194a0 Move settings to own package 2018-12-06 17:38:10 +01:00
0xboobface b100f107d4 Move site activation checkbox to their config ui 2018-12-06 14:16:10 +01:00
0xboobface 9f19b2c1fa Merge branch 'dev' into notify 2018-12-05 16:08:55 +01:00
0xboobface e6476e95ec Add setting to ignore the upscaled video stream on MFC 2018-12-05 16:08:44 +01:00
0xboobface 42177b4399 Add enum to Model for the online states 2018-12-05 15:51:21 +01:00
0xboobface 6b4d320bc2 Add setting to set the base URL for MFC 2018-12-02 22:35:12 +01:00