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

210 Commits

Author SHA1 Message Date
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
0xboobface 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
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 e8572434a9 Set version to 1.17.1 2019-01-23 17:41:03 +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 0e9ae32161 Merge branch 'master' into dev 2019-01-23 14:24:34 +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 7b2f30474a Make sure the reader thread is ready before sending any commands 2019-01-21 15:34:18 +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 6262d50f74 Log browser output 2019-01-20 17:58:10 +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 11f2a3ef8d Increase version to 1.17.0 2019-01-19 16:06:50 +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 ceb65f0ff2 Logging 2019-01-17 12:20:29 +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 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
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 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
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 0c35f4c219 Merge branch 'dev' into fc2 2018-12-17 23:01:21 +01:00
0xboobface 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
0xboobface 75fedfcddd Disable minimum length in remote mode 2018-12-17 18:28:29 +01:00