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

333 Commits

Author SHA1 Message Date
0xboobface 2a3e9c0634 Add padding to description, if model is recording 2018-11-07 17:22:19 +01:00
0xboobface 8b7bb79d8c Change the URL if the name changed 2018-11-07 13:51:26 +01:00
0xboobface ba0cc591d3 Add setting for HTTP User-Agent header 
Replace all occurences of the User-Agent header with the user-agent
string from the settings
 2018-11-07 13:49:56 +01:00
0xboobface a2f048fe0d Add a cookie to define the sorting for BongaCams 
The cookie is set to sort by popularity
 2018-11-06 23:17:01 +01:00
0xboobface 2a5c0ccd43 Set offset to be a multiple of 36 
The server returns lists of 36 models, so we have to align our
offset to that.
 2018-11-06 23:15:44 +01:00
0xboobface 091628b486 Check, if tipping was successful 2018-11-06 22:36:02 +01:00
0xboobface 1b11af8872 Try to restore HTTP session with cookies before login in 
All the HTTP clients now check, if loading the cookies was sufficient
to restore the HTTP session. If yes, we assume that we are logged in.
If not, the normal login procedure is done.
 2018-11-06 22:17:30 +01:00
0xboobface 75351cedb5 Cookies are now persisted in the config dir 2018-11-06 21:54:11 +01:00
0xboobface b73627c0fb Put settings tab into ScrollPane 
... to support small screens
 2018-11-06 20:36:09 +01:00
0xboobface 43793f3728 Use guava caches to store SessionStates and models 
Use caches with a maximum size of 4000 elements instead of maps
to avoid running out of heap memory
 2018-11-06 20:27:07 +01:00
0xboobface 1fc22876fd Reduce size of received message history to save memory 2018-11-06 19:43:15 +01:00
0xboobface f26cb547b7 Merge BongaCams implementation from feature branch to dev 2018-11-06 19:32:49 +01:00
0xboobface a136c9ccd2 Prepare code to persist http cookies 
Save and reload the cookies might help to avoid logins between sessions.
 2018-11-06 19:32:21 +01:00
0xboobface f15b57ce9a Remove websocket stuff 2018-11-06 18:56:31 +01:00
0xboobface f8f0d5082e Add friends tab to BongaCams 2018-11-06 18:56:21 +01:00
0xboobface d768cbb1ff Implement tipping for bongacams 2018-11-06 18:38:20 +01:00
0xboobface a5ddf4f509 Remove unnecessary response.close() 2018-11-06 18:36:28 +01:00
0xboobface efc4719018 Add possibility to suspend the recording for model 
This makes it possible to stop the recording without loosing track
of the model. The user can pause/unpause recordings in the recorded
models tab. There is also an new column "Paused", which indicates, if
the recording is suspended for a model.
 2018-11-06 16:35:41 +01:00
0xboobface 6b16a637f0 Add JVM parameter to define the configuration directory 
Add a new JVM parameter (-Dctbrec.config.dir) to define the directory
to save the config to / load it from. If this parameter is not set, the
system default directory determined by OS.getConfigDir() is used.
 2018-11-06 14:32:35 +01:00
0xboobface 69194e2800 Add login dialog for BongaCams 2018-11-06 00:17:41 +01:00
0xboobface 2f1ebabf00 Add more tabs to BongaCams 2018-11-05 19:50:26 +01:00
0xboobface 682f78bdac Remove dependency to JavaFX from the server code 
The sites had a direct depedency to JavaFX, which prevents the server
to be started with openjdk. The affected code is no located in ConfigUI,
so that the no direct dependency exists.
 2018-11-05 19:02:22 +01:00
0xboobface 46c3feeb1f More stuff for BongaCams 2018-11-05 19:00:26 +01:00
0xboobface 26bd482eac Remove dependency to JavaFX from the server code 
The sites had a direct depedency to JavaFX, which prevents the server
to be started with openjdk. The affected code is no located in ConfigUI,
so that the no direct dependency exists.
 2018-11-05 18:59:25 +01:00
0xboobface 1fec124bbc Add BongaCams 
This is the first working version. Follow / unfollow and tipping are not
implemented.
 2018-11-05 00:41:22 +01:00
0xboobface 29ed8648e4 Fix button width 2018-11-04 22:29:15 +01:00
0xboobface 7daffd2594 Fix sorting by date in recordings table 2018-11-04 20:10:34 +01:00
0xboobface e9b699fdda Change log level 2018-11-04 13:40:59 +01:00
0xboobface 9da580c6e8 Add setting to define a maximum resolution for recordings 2018-11-04 13:37:27 +01:00
0xboobface 97e2338cec Move getSegmentPlaylistUrl from AbstractModel to AbstractDownload 2018-11-04 13:24:34 +01:00
0xboobface dbd5a42dbc Show image placeholder in camsoda shows tab in dev mode 2018-11-03 13:36:47 +01:00
0xboobface b24b2fe3fe Merge branch 'dev' into camsoda 2018-11-03 00:39:38 +01:00
0xboobface e0d65c8572 Call /api/v1/user/current to check the login status 2018-11-02 19:50:26 +01:00
0xboobface 95a3e2dc79 Don't open login dialog, if login has captcha 
The login dialog doesn't work anyways. So it makes more sense to
show a reasonable error dialog at the moment.
 2018-11-02 19:50:22 +01:00
0xboobface 9b39440190 Make login dialog more robust 2018-11-02 19:50:18 +01:00
0xboobface 233dd3fa9c Implement tipping for CamSoda 
Sending tips for CamSoda works now
 2018-11-02 18:14:36 +01:00
0xboobface cbc4a5e339 Fix model parsing 
JSON structure seems to have changed slightly
 2018-11-02 18:13:40 +01:00
0xboobface 625b7727d0 Add affiliate link to MyFreeCams 2018-10-31 14:17:47 +01:00
0xboobface 07dee1a631 Add detection of model name changes for MyFreeCams 
MyFreeCamsModel now also takes the uid into account instead of only
using the the name. To support this feature between sessions, the uid
is saved as site specific data.
 2018-10-31 13:57:04 +01:00
0xboobface bc40c16000 Add possibility to safe site specific data 
Extend the json serialization to allow to write site specific data
for each model.
 2018-10-31 13:55:03 +01:00
0xboobface 6faee8290c Remove initial login 
Login should we done on demand
 2018-10-31 01:35:18 +01:00
0xboobface b90313dd86 Restart websocket, if no message arrived for 2 mins 2018-10-31 01:34:45 +01:00
0xboobface a66d4100cf Merge branch 'dev' into camsoda 2018-10-31 00:05:58 +01:00
0xboobface 4696c0f534 Put all site config panes in an accordion 2018-10-31 00:04:53 +01:00
0xboobface 91210f8add Add comment 2018-10-30 23:21:55 +01:00
0xboobface 7d4245e44e Disable tips for the time being 2018-10-30 23:21:39 +01:00
0xboobface d6b443b05a Implement follow and unfollow for CamsodaModel 2018-10-30 23:18:50 +01:00
0xboobface 6de58c3805 Change package for CookieJarImpl in logback.xml 2018-10-30 23:17:40 +01:00
0xboobface 5333e427ad Add CamSoda login dialog 
This dialog is shown, if the normal login didn't work. For example,
if you log in several times in a short amount of time, they respond
with "Please confirm that you are not a robot" and you have to log
in with a captcha
 2018-10-30 21:13:48 +01:00
0xboobface efbae57113 Set webengine user dir to child of config dir 2018-10-30 21:10:42 +01:00
0xboobface f2832940f1 Move CokkieJarImpl to io package 2018-10-30 21:09:46 +01:00
0xboobface 30add6aa3f Fix bug in cookie update code of CookieJar 2018-10-30 21:08:37 +01:00
0xboobface 3d245d6515 Add buttons to follow and open in browser to show tab 2018-10-30 19:07:10 +01:00
0xboobface b476c452ad Merge branch 'dev' into camsoda 
Conflicts:
	src/main/java/ctbrec/Settings.java
	src/main/java/ctbrec/recorder/server/HttpServer.java
	src/main/java/ctbrec/ui/CamrecApplication.java
	src/main/java/ctbrec/ui/ThumbCell.java
 2018-10-30 19:06:20 +01:00
0xboobface b19ea01ce7 Only do initial login if credentials are available 2018-10-30 18:24:40 +01:00
0xboobface 1b0b5f18a4 Add assembly descriptor for macOS 2018-10-30 18:21:13 +01:00
0xboobface 57e6013142 Update the embedded JRE for the Windows bundles to 8u192 2018-10-30 16:10:19 +01:00
0xboobface 0c9fc5cba6 Fix JSON parse exception 2018-10-30 15:57:44 +01:00
0xboobface 007ed19d97 Add more tabs 
Add tabs for male and couples
 2018-10-30 15:57:24 +01:00
0xboobface c445e48d6d Don't try to log in twice 2018-10-30 15:24:02 +01:00
0xboobface 7f3bedd3a1 Clean up code 2018-10-29 23:25:50 +01:00
0xboobface c8e3db4021 Merge branch 'dev' into cam4 2018-10-29 22:38:27 +01:00
0xboobface 97e7466352 Fix UI freeze caused by OnlineMonitor 
The lock to prevent concurrent access to the list models caused
the app to freeze, if the models list contained many models, because
the OnlineMonitor would block access until it checked the online
state of every model.
 2018-10-29 22:30:15 +01:00
0xboobface 2ffdbfa71a Add followed tab for Cam4 2018-10-29 21:53:41 +01:00
0xboobface dab3466cf6 Simplify login method 2018-10-29 21:53:15 +01:00
0xboobface 4d1e841448 Improve login success check 2018-10-29 18:12:52 +01:00
0xboobface 936984c71d Add window icon to Cam4 login dialog 2018-10-29 17:57:14 +01:00
0xboobface 43cb005fcd Add login dialog for Cam4 
The login dialog uses a WebView to load the login form from cam4.com
Username and password get filled in by ctbrec, the user has to solve
the captcha. Afterwards all cookies (especially the session cookie)
are extracted from the webview and transfered to the OkHttp client,
so that it can be used for further requests.
 2018-10-29 17:36:58 +01:00
0xboobface 64beb44316 Fix typo in log statement 2018-10-29 13:51:08 +01:00
0xboobface dc6b514d8f Disable follow/unfollow for the time being 2018-10-29 13:49:04 +01:00
0xboobface 8fd09fd521 Implemented followed tab for CamSoda 2018-10-28 21:23:58 +01:00
0xboobface a841457a90 Add HD tab 2018-10-27 23:28:08 +02:00
0xboobface 88d8430f98 Added sleep to resolution update task 
...to throttle the number of request fired in a small amount of time
 2018-10-27 23:27:44 +02:00
0xboobface e97b417480 Set backbround of ThumbCell to lightgray 2018-10-27 22:32:15 +02:00
0xboobface 34f443c6a9 First addition for Cam4 2018-10-27 22:32:07 +02:00
0xboobface 8287d04396 Set playlist parsing mode to lenient 2018-10-27 22:30:17 +02:00
0xboobface 7442ddd3e4 Show thumb, if offline_picture is not available 
Tweak the insets
 2018-10-27 18:50:29 +02:00
0xboobface 07864dc10a Add Camsoda tab with upcoming shows 2018-10-27 18:40:24 +02:00
0xboobface d4bff345a1 Add Camsoda to sites in HttpServer 2018-10-26 23:01:17 +02:00
0xboobface a31bad7466 Set backbround of ThumbCell to lightgray 2018-10-26 16:13:44 +02:00
0xboobface 209ec64e3d Merge branch 'dev' into camsoda 2018-10-26 14:33:33 +02:00
0xboobface 4e0fb6aaf0 Ignore models for disabled sites in LocalRecorder 2018-10-26 14:16:17 +02:00
0xboobface ebbfacd802 Complete json parsing 2018-10-26 01:55:08 +02:00
0xboobface 60494a09fd Sort by camsoda sort value 2018-10-26 01:23:07 +02:00
0xboobface e940a81d41 Fix height of background etc 2018-10-26 01:22:49 +02:00
0xboobface 6ca7d43069 Implemented camsoda 2018-10-26 01:03:13 +02:00
0xboobface 6be09079a3 Improve logging 2018-10-26 00:59:14 +02:00
0xboobface 02b50f61c5 Merge branch 'dev' into camsoda 2018-10-25 20:11:53 +02:00
0xboobface 5cd8ae3cff Add possibility to disable sites 
Sites can be disabled in the settings, so that they don't get
initialized on start. The UI is not created for them aswell.
 2018-10-25 20:11:25 +02:00
0xboobface 9f9d726e5c Add site Camsoda 
Add new package and classes for camsoda.com
 2018-10-25 16:19:47 +02:00
0xboobface b4b3e7e910 Improve log statement 2018-10-25 12:56:32 +02:00
0xboobface 4e1c7f7189 Add ColumnConstraints to split up space 50/50 2018-10-25 12:42:02 +02:00
0xboobface f0154857d9 Add mechanisms to have credentials/settings for each site 
Each site can now provide its own configuration panel. For
Chaturbate and MyFreeCams these panels contain input fields
for the user credentials.
 2018-10-25 12:27:46 +02:00
0xboobface 7e6f5bbc2c Add log statement 2018-10-25 10:55:24 +02:00
0xboobface 91a41d446b Add trace log statement for arriving NULLs 
This helps to see, if the websocket is still healty
 2018-10-25 10:50:57 +02:00
0xboobface 330bd29bbf Improve logging for easier debugging 2018-10-25 10:49:56 +02:00
0xboobface 0a1cd11a64 Set follow menu entry to disabled instead of hiding it 2018-10-25 00:45:41 +02:00
0xboobface 54381c1676 Change filter in HD cams update service 
Chnage the filter to include streams from wowza servers
 2018-10-25 00:01:59 +02:00
0xboobface 0bcea4e753 Fix message parser 
The parser didn't take into accoun, that the arriving string can
contain several messages
 2018-10-24 23:40:53 +02:00
0xboobface ff0d1b5eae Fix live preview for wowza servers 2018-10-24 23:39:46 +02:00