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

191 Commits

Author SHA1 Message Date
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 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 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
0xboobface 2a1dc77a89 Increase version number to 1.16.0 2018-12-17 17:53:53 +01:00
0xboobface 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
0xboobface 47d8101ce8 Avoid NPE in onError 2018-12-17 15:21:36 +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 bfbd6b1782 Open the player on double-click in the Recording tab 
Implements #121
 2018-12-16 20:38:58 +01:00
0xboobface 910d21463a Fix: allow empty input / deletion of post-processing script 2018-12-16 20:29:48 +01:00
0xboobface d74737113a Change max resolution input to textfield 
... to allow arbitrary values
 2018-12-16 20:04:26 +01:00
0xboobface 10184176b0 Enable JavaScript and register an error handler 2018-12-16 19:53:54 +01:00
0xboobface 7b7c7b24b1 Replace Exception parameter with Throwable 2018-12-16 17:50:56 +01:00
0xboobface a7ab34c9d7 Set user data directory for WebbrowserTab 2018-12-16 17:25:05 +01:00
0xboobface 3d7fc64bf5 Improve error handling in the StreamPreview 2018-12-16 17:20:27 +01:00
0xboobface f75687752c Add config setting for stream previews in thumbnails 
This setting allows to switch stream previews of in the thumbnail
views. The little play circle will not show up.
 2018-12-16 17:19:57 +01:00
0xboobface f631306768 Tweak video preview in thumb cell 2018-12-15 20:33:57 +01:00
0xboobface d09aad1bf6 Move stream preview to its own control 
Move stream preview to its own control, so that it can be used in
the ThumbCell, too
 2018-12-15 15:55:17 +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 b83235a32f Log error, if sending tip failed 2018-12-14 23:36:00 +01:00
0xboobface bd719eac08 Remove direct refences to chaturbate in TipDialog 
This dialog is used for other sites, too. So we have to use the site
object to get the name and the affiliate link
 2018-12-14 23:35:44 +01:00
0xboobface 4d7409f443 Implement follow/unfollow and login with cookies 2018-12-14 20:25:57 +01:00