ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity
850 Commits 2 Branches 1 Tag 17 MiB
Commit Graph

227 Commits

Author SHA1 Message Date
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
0xboobface 75ab95e1ea Shut down more gracefully (hopefully) 2018-12-14 17:43:38 +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 ceb7c07aa8 Add setting for minimum recording length 
If a recording is shorter than x seconds, it gets deleted
 2018-12-13 20:54:10 +01:00
0xboobface 9d86a0531c Bump version to 1.15.0 2018-12-13 16:24:45 +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 10c0728e05 Avoid NPE when is not yet loaded 2018-12-13 15:21:31 +01:00
0xboobface fb54f464ab Remove irrelevant TODO comments 2018-12-13 15:21:09 +01:00
0xboobface 9f287b6d81 Fix possible IndexOutOfBoundsException in the follow animation 2018-12-13 02:35:03 +01:00
0xboobface 5c4125c03e Fix: selection overlay did not show 
The selection overlay did not show when a tab was opened the first time
 2018-12-12 18:30:50 +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 c944323aa4 Set min Java version to 10 and change JRE download URL 2018-12-12 13:25:26 +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 2d1ac40c72 Move token label and buy button to ThumbOverviewTab 2018-12-11 15:47:19 +01:00
0xboobface bb3de83453 Logout and delete cookies when credentials are changed 2018-12-10 18:37:04 +01:00
0xboobface 04382dfa6e Run registerAlertSystem in a thread 2018-12-10 17:57:12 +01:00
0xboobface 064efd2863 Register event handler 1 min after start 
Don't register before 1 minute has passed, because directly after
the start of ctbrec, an event for every online model would be fired,
which is annoying as f
 2018-12-10 17:16:39 +01:00
0xboobface e7f1d26a84 Bumb version to 1.14.0 2018-12-10 17:15:33 +01:00
0xboobface 5b15b77014 Disable post-processing for server mode 2018-12-10 15:18:24 +01:00
0xboobface 448cfd14b8 Clear state comboboxes before filling them to avoid duplicates 2018-12-10 14:34:56 +01:00
0xboobface b715fba836 Add validation for recording state 2018-12-10 14:32:33 +01:00
0xboobface 316842e690 Revert removal of post-processing setting 2018-12-09 21:37:24 +01:00
0xboobface 5b936c779d Add helper class for dialogs 2018-12-09 21:36:10 +01:00
0xboobface 878b25c55c Add validation to actions panel 2018-12-09 21:35:35 +01:00
0xboobface 7c16006870 Set the name in the default constructor 2018-12-09 19:02:19 +01:00
0xboobface 888046676f Add first configurable version of the notification system 2018-12-09 18:46:33 +01:00
0xboobface 434001aafe Optimize settings tab layout 2018-12-08 17:14:25 +01:00
0xboobface a944117966 Change layout of color settings panel 2018-12-08 17:13:58 +01:00
0xboobface 9825383d0c Set textfield to grow horizontally 2018-12-08 17:13:39 +01:00
0xboobface 509a9115fa Set user data directory for webengine 2018-12-08 16:49:47 +01:00
0xboobface 65f7c0d85e Use file/dir selection boxes and remove post-processing setting 2018-12-08 16:08:00 +01:00
0xboobface 016c95f7f1 Make file/dir selection boxes usable 2018-12-08 16:07:30 +01:00
0xboobface 4d55351919 Create controls for file, program and directory selection 2018-12-08 15:34:50 +01:00
0xboobface 1fc16a0d41 Add a few predicates and actions for the event system 2018-12-08 13:08:20 +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 69544a7a60 Pull OnlineMonitor out of LocalRecorder 2018-12-05 21:01:33 +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 65e6c5b76e Merge branch 'dev' into notify 2018-12-05 12:58:51 +01:00
0xboobface 28fee0b2e6 Preselect the right entry, if stream url index is set 2018-12-05 12:20:50 +01:00
0xboobface 6db00969d7 Revert: RemoteRecorder does not work, if called with JavaFxModels 
It does not work, because it uses the class name for the type and the
server doesn't know JavaFxModel. It only knowns the unwrapped model
classes.
 2018-12-05 12:20:26 +01:00
0xboobface b99e88d2c8 Add cache for the resolution 
This makes the display of the resolution much faster and the information
is retained, even if the ThumbCell is "destroyed"
 2018-12-04 18:30:46 +01:00
0xboobface 9791427aeb Add "Follow" to the context menu of the recorded models tab 2018-12-04 17:09:19 +01:00
0xboobface 1f6e03979e Fix: ThumbCell resumes recordings 
This happens because the update services don't set the suspended
property and ThumbCell copied the property from the updated model.
So, suspended would be set to false, which would cause an update of
the property change listener and that would restart the recording.
 2018-12-04 17:08:44 +01:00
0xboobface 0121e02edb Merge branch 'dev' into notify 2018-12-03 14:35:24 +01:00
0xboobface 889dbecb14 Bump version to 1.13.0 2018-12-03 00:14:50 +01:00
0xboobface 6b4d320bc2 Add setting to set the base URL for MFC 2018-12-02 22:35:12 +01:00
0xboobface 96b5c26277 Implement notification messages with SystemTray and notify-send 2018-12-02 17:02:17 +01:00
0xboobface 723909aec3 Remove notification class and resources 
Notifications are done with SystemTray or a call to notify-send
 2018-12-02 17:01:00 +01:00
0xboobface 1feea03ec3 Dispose the video player on error 2018-12-02 13:32:38 +01:00
0xboobface 0ff04ed9ef Use /bin/bash in shebang 
... otherwise pushd and popd might not work
 2018-12-02 02:07:30 +01:00
0xboobface 80381c0d49 Fire events from LocalRecorder 2018-12-01 21:56:23 +01:00
0xboobface 5b8cfc02d6 Merge branch 'dev' into notify 2018-12-01 20:22:02 +01:00