2dd32fed0c
Fix URLs for models with special characters in their name
2020-10-05 18:44:16 +02:00
0b384cf85e
Improve Bongacams online state detection
2020-10-04 19:31:34 +02:00
a2e2dbda6d
Catch JSON parse exception
2020-10-04 15:20:23 +02:00
1350dce14f
Fix BongaCams online check
...
Fix Bongacams unfollow
2020-10-03 16:14:24 +02:00
3b3854c488
Fix Streamate followed tab
...
Also use a preview image instead of the bio pic
2020-10-03 13:59:19 +02:00
3bf9c5fa26
Fix JSON parsing exception
...
Sometimes performerData is not available. In this case we assume the
model is offline
2020-09-30 10:52:30 +02:00
099ccc9399
Remove console output
2020-09-29 13:27:09 +02:00
e4eee063ba
Fix Showup downloads
...
Add cid and pid to the playlist url, which fixes the download
functionality. But downloads now stop after a couple of minutes if you
are not logged in.
2020-09-28 14:34:11 +02:00
d7d3e2944b
Extend HlsDownload for MV Live to update the cloudflare cookies regularly
2020-08-24 15:16:45 +02:00
337b096568
Fix API calls newer than Java 8
2020-08-21 18:19:59 +02:00
05837b2fed
Reset MFC WS on message parsing exception
2020-08-21 18:09:55 +02:00
fa3e5fbcaf
Fix MFC models changing to other models
2020-08-19 18:25:24 +02:00
2665d50ee1
Assume unknown show type means ONLINE
2020-08-19 17:53:15 +02:00
335cdb8cb4
Add createModelFromUrl for MVLive
2020-08-18 20:25:05 +02:00
096ed7a734
Implement proper online check and add search
2020-08-18 19:58:48 +02:00
2455797fb2
Use a different HTTP client for each MVLive download
...
MVLive only allows recording of mor than one stream, if the recorder looks like different HTTP sessions.
That's why we use a different HTTP client with its own cookie jar for each recording.
2020-08-18 14:39:48 +02:00
e06bfaf88b
Change the request to get the room number
2020-08-18 10:19:26 +02:00
36885900b5
Add regular cloudflare cookie updates
...
MVLive updates those cookies every 2 minutes. This makes sure, that the streaming continues. IF the cookies are not updated, the stream ends after around 2:30 minutes
2020-08-17 12:19:24 +02:00
db186e65f4
Merge branch 'dev' into manyvids
...
# Conflicts:
# common/src/main/java/ctbrec/io/HttpClient.java
2020-08-16 17:00:43 +02:00
792a6c10c8
Revert MFC websocket message parsing change
2020-08-15 17:17:31 +02:00
6cfdb59c96
Remove log output
2020-08-15 16:06:47 +02:00
192e7093d3
Fix Flirt4Free models losing their name
2020-08-15 15:29:21 +02:00
0e61421537
Fix MFC websocket message parser
2020-08-14 19:16:39 +02:00
ee302e49a4
Distinguish between performer_id and display_name for LiveJasmin models
2020-08-09 11:04:24 +02:00
b6e4bad837
Fixed bug in JSON parsing
...
Some models wouldn't get recorded, because of a missing element in the
JSON doc
2020-08-08 21:23:38 +02:00
cbd529d001
Replace wrong username used to retrieve the token balance
2020-08-08 13:37:21 +02:00
d63c98cf36
Fix NPEs in MFCs ServerConfig
2020-07-26 15:14:22 +02:00
c80230cee7
Add support for xHamsterLive
2020-07-20 18:44:25 +02:00
e50b9bcc71
Close response in onClosed in F4F websocket
2020-07-19 18:23:16 +02:00
7462d68d7b
Add external login dialog for stripchat
...
This also enables us to support xhamsterlive
2020-07-19 15:17:31 +02:00
882742ce3b
Make MFC client and getOnlineModels more robust
2020-07-18 19:30:24 +02:00
010c4a04cd
Adjust log levels
2020-07-18 19:15:09 +02:00
7ff731ec88
Fix CamSoda downloads
2020-07-18 19:05:41 +02:00
c50519be82
Fix CamSoda recordings
2020-07-18 12:48:00 +02:00
4b2e17d0b1
Fix Cam4 favorites tab
2020-07-16 19:51:14 +02:00
03b6de626c
Fix Streamate
...
The way to obtains the xsrf token has changed
2020-07-16 18:53:22 +02:00
296585463a
Don't apply min/max resolution settings, if resolution is unknown
2020-07-12 13:32:06 +02:00
9bb18426a6
Interrupt keep alive thread on reconnect
...
On reconnect interrupt the current keep alive thread, so that we don't
pile up a bunch keep alive threads, if the there is a problem with the
websocket connection.
2020-07-11 14:15:34 +02:00
6600b0da94
Get the authentication and the stream working
2020-07-10 22:12:28 +02:00
ed0f5476b5
Merge branch 'dev' into manyvids
2020-07-10 18:09:26 +02:00
64569f83ab
Optimize http client shutdown
2020-07-05 14:07:15 +02:00
d2c2cb476b
Fix MyFreeCams websocket message parsing
2020-07-03 18:56:59 +02:00
d3d9662ec5
Add websocket client
2020-06-20 11:17:19 +02:00
e6fa97dc15
Add affiliate link
2020-06-14 15:07:58 +02:00
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
e59de2f70b
Add base classes for Manyvids Live
2020-06-14 15:06:17 +02:00
3b5cbfaddf
Fix NPE in getHttpHeaderFactory in MyFreeCamsModel
2020-06-14 11:22:01 +02:00
43d2676e11
Add HttpHeaderFactory mechanism
...
Each model can provide its own factory to provide HTTP headers for the
different download requests (playlist, segment playlist, segments)
2020-06-12 18:24:34 +02:00
cd6175a7eb
Add BandwidthMeter, which tracks the current bandwidth usage
2020-06-12 18:21:32 +02:00
bd48d6bf9c
Set version to 3.8.0
2020-06-12 18:10:56 +02:00
d55f1c04ee
Fix MFC websocket communication
...
The protocol had been changed for the initial login sequence
2020-06-09 19:33:43 +02:00
acd6126619
Add "New" tab to each site where it was missing
2020-06-07 13:53:54 +02:00
fdce3bcec0
Fix chaturbate login check
...
The check if ctbrec is logged in always returned true because of a
change on the user profile page. ctbrec now uses the user icon to check,
if the user is the anonymous user or a logged in user.
2020-06-07 12:28:08 +02:00
b87f090ac3
Add max resolution setting for the player
2020-05-31 14:50:12 +02:00
0858941b50
Fix NPE in MFC client
2020-05-23 16:20:49 +02:00
f1a0e5900c
Fix createModelFromUrl for Showup and Fc2Live
2020-05-23 16:20:32 +02:00
3958a7b5f1
Reduce log level in getModelList
2020-05-23 13:47:07 +02:00
9eea66d94f
Remove the uid field from ShowupModel
2020-05-20 19:37:01 +02:00
9462a31111
Improve detection of stream termination
2020-05-20 19:00:09 +02:00
c05785cd20
Improve Showup online detection
2020-05-20 18:18:29 +02:00
33a0094b19
Adjust to Stripchat API changes
2020-05-20 18:17:46 +02:00
a91923baff
Use the small preview image for the thumbnails
2020-05-16 22:45:15 +02:00
9cd9bdf973
Remove handling for online states private and group
...
They don't seem to affect the recording of the stream
2020-05-16 22:19:55 +02:00
39c1fd94ba
Fix isOnline for SHowupModel
2020-05-16 21:34:39 +02:00
1a5c32167e
Preparation for Showup login
2020-05-16 21:30:25 +02:00
6c85a2a493
First working version of Showup.tv
2020-05-16 16:28:44 +02:00
2e4ec80bd8
Reduce visibility of public method
2020-05-10 10:43:53 +02:00
a0d9835192
Fix streamate stream source parsing
2020-04-28 22:05:06 +02:00
3c86310edf
Add stream source "Origin"
2020-04-23 19:28:12 +02:00
a30d4ed463
Change data type of all Integer fields to String
2020-04-18 19:51:40 +02:00
0c7650f94f
Remove retry loop in getNextSegments
...
This might cause blocks by MFC because we are asking for a resource,
which is not available.
2020-04-18 19:50:42 +02:00
a37a018159
Remove outdated settings for MFC
2020-04-13 19:43:33 +02:00
e5a9c468eb
Remove "(broken)" from MFC's title
2020-04-13 18:52:29 +02:00
ae6fa229e7
Add user-agent agent header to every http request in MFC classes
2020-04-13 18:42:57 +02:00
970b9ab574
Fix follow/unfollow for BongaCams
2020-03-28 13:07:54 +01:00
2eb1b17513
Change cookie name of the sorting settings
2020-03-02 20:45:24 +01:00
2f013bc870
Change BongaCams online check
2020-02-29 18:30:57 +01:00
46bd8667c8
Separate site name and displayed title
2020-02-26 21:40:58 +01:00
8cafc7124f
Add search for Stripchat
2020-02-23 19:36:14 +01:00
e4b9da7685
First working implementation for Stripchat
2020-02-23 18:47:37 +01:00
71be9b3665
Improve support for server-side single files
2020-02-22 17:40:22 +01:00
bc929cc6e1
Switch to MergedFfmpegHlsDownload
2020-02-22 14:33:51 +01:00
d2f490f8f6
Add FFmpeg downloaders
2020-02-22 11:20:10 +01:00
110fc2a6bf
Fix LiveJasmin HD recordings
2020-02-16 15:18:38 +01:00
316d2a7e22
Fix loading of the Streamate model ID
2020-01-31 19:50:17 +01:00
741072b1f0
Rename site to MyFreeCams (broken)
2020-01-26 19:18:30 +01:00
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
3cf6038da0
Don't kill the ws in the keep-alive thread, if it is establishing a
...
connection
2020-01-11 13:20:49 +01:00
b12f3e5789
Add setting to switch between DASH and HLS for MFC
2020-01-03 12:27:06 +01:00
24cb3ecf99
Use HLS streaming for MFC models again
2019-12-30 16:15:47 +01:00
8596b1e6e1
Fix log statement, which prevent getMasterPlaylist form working
2019-12-29 15:07:09 +01:00
e333175ecb
Fix stream URL for wowza HLS streaming
2019-12-28 19:54:55 +01:00
a9d87bfd99
Code cleanup
2019-12-28 19:54:04 +01:00
87b0ce0d21
Use constants from HttpConstants
2019-12-27 15:14:55 +01:00
da4c1bda2c
Change log levels of some log messages
2019-12-27 14:02:33 +01:00
b72777f6fb
Code cleanup
2019-12-27 13:51:48 +01:00
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
33c7c6606d
Improve playlist loading for Cam4Model
...
Also improve isOnline to take into account, if a playlist url is
available or not
2019-12-26 23:44:26 +01:00
c2901284ef
Improve error handling in downloads
2019-12-26 21:47:03 +01:00
c774a29421
Improve error handling for loading the master playlist for Cam4Models
2019-12-26 21:46:57 +01:00
2fb2c932aa
Fix "rerun pp" for MFC dash downloads
2019-12-21 18:59:31 +01:00
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
00ea43c8b3
Move HLS related classes ot own package
2019-11-30 16:40:01 +01:00
ddbd8de900
Fix Flirt4Free thumb overviews and recording
2019-06-08 10:34:44 +02:00
f2cae6a312
Fix model online check for BongaCams
2019-06-02 16:51:07 +02:00
f11fcf7ca1
Rewrite recording code for remote recording
2019-06-01 12:12:46 +02:00
0f3d0b6337
Rewrite recording code for local recording
...
Remote recording is TBD
2019-05-31 20:00:07 +02:00
f7ac97c683
Implement interface changes
2019-05-11 15:12:48 +02:00
ca8e0a269e
Remove caches from Chaturbate code
...
- Remove caches from the Chaturbate class
- Move all model related code from Chaturbate to ChaturbateModel
- Use a User-Agent string in all HTTP requests
2019-05-11 15:10:42 +02:00
35c8378d88
Add mechanism to restrict the number of requests
...
Flirt4Free is finnicky with the amount of requests you can do. So we use
a mechanism to only allow 2 requests at a time and a cooldown of 500 ms
between requests.
2019-05-11 15:03:15 +02:00
1b129ebd41
Add suffix parameter to getFileForRecording
...
This allows different download types to support different file types
2019-04-21 12:42:48 +02:00
0b7eeca5f7
Fix: Post-Processing for split recordings
2019-04-20 22:01:53 +02:00
133afc2475
Merge branch pprefactor
2019-04-20 15:24:43 +02:00
3cd341d88e
Set affiliate link
2019-04-20 12:50:27 +02:00
6e6597d372
Move post-processing from LocalRecorder to Download
2019-04-20 11:49:41 +02:00
4bc92a9dda
Remove debug output
2019-04-18 20:21:09 +02:00
2d048369a1
Fix JSON exception in isOnline
2019-04-17 14:37:47 +02:00
204eb99b29
Implement follow/unfollow for Flirt4Free
2019-04-16 19:51:57 +02:00
8f5c7ac9c4
Implement login and token balance
2019-04-15 19:17:41 +02:00
50c38d16a7
Implement login for Flirt4Free
2019-04-15 19:16:04 +02:00
1700eeecf5
Implement search for Flirt4Free
2019-04-15 17:42:20 +02:00
94460d1e94
Implement "add by name" and "add by url"
2019-04-15 16:39:09 +02:00
15bfe0f44f
Add basic functionality for Flirt4Free
2019-04-12 21:57:53 +02:00
6c6fadd742
Set isOnline to false, of the model is not online
2019-04-10 14:36:24 +02:00
2a74761c54
Make sure the playlist is not empty when checking the online state
2019-04-07 12:03:00 +02:00
7ffa41944c
Fix online check for BongaCams
...
The online check now consists of three steps: 1. check, if the model's
state is online on its profile page. 2. check, if the room status is
public with getRoomData 3. check, if the stream playlist is available
2019-04-04 18:07:19 +02:00
335233f473
Replace EvictingQueue with own implementation
...
For some unknown reason the EvictingQueue didn't evict or evicted only
partially. Nevertheless it caused an OutOfMemoryError.
2019-03-21 14:51:52 +01:00
1dd432dbd9
Add base URL setting for Bongacams
2019-03-05 17:01:42 +01:00
a249be01c7
Fix: Adjust Streamate search code to new JSON format
...
Streamate has changed the JSON response for the search. This change
adjusts our code to handle that new format.
2019-02-22 13:42:44 +01:00
37fc341767
Remove debug log
2019-02-20 13:47:34 +01:00
6dbdac6df5
Fix json exception in online check for BongaCams
2019-02-20 13:44:56 +01:00
e1eeb830da
Add getSanitizedName to Model
...
This method provides returns a name, which is safe to use with
filesystem I/O. Fc2Model returns the model ID for this.
2019-02-19 15:28:52 +01:00
6e58dd6be5
Implement follow/unfollow for BongaCams
2019-01-29 16:28:07 +01:00
e7feaad11c
Merge branch 'dev' into fc2
2019-01-29 13:05:43 +01:00
9f13a54eb6
Remove misleading log message
2019-01-28 16:20:07 +01:00
8e2abd2f11
Implement createModelFromUrl for FC2Live
2019-01-28 14:44:45 +01:00
626d13f87a
Implement createModelFromUrl
2019-01-28 13:32:42 +01:00
df38ed3027
Sanitize name before creeating a model object
...
Names can contain '/' on FC2Live, which messes with the directory
structure of recordings
2019-01-27 15:18:19 +01:00
ba0c456f19
Reduce log level for FC2Live websocket messages to TRACE
2019-01-27 15:17:30 +01:00
76c5c2e6c6
Remove log message
2019-01-27 14:10:45 +01:00
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
0f51be96c0
Implement FC2Live downloads for the server
2019-01-24 20:24:09 +01:00
16752b892c
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/sites/jasmin/LiveJasminHttpClient.java
2019-01-24 19:16:52 +01:00
aa093c0ec1
Delete all LiveJasmin cookies, if we are guests
2019-01-24 15:47:26 +01:00
0417fd6bfb
Remove guest session cookies on start for LiveJasmin
2019-01-24 15:41:47 +01:00
beeaca4beb
Implement login and follow/unfollow
2019-01-24 15:24:05 +01:00
6bb6637683
Remove guest session cookies on start for LiveJasmin
2019-01-23 18:27:34 +01:00
16fdee2a2c
Merge branch 'dev' into fc2
...
# Conflicts:
# client/src/main/java/ctbrec/ui/ExternalBrowser.java
2019-01-23 17:56:20 +01:00
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
9bfd15b35e
Use a different way to retrieve the master playlist
...
@M1h43ly posted URLs in #153 , which work without being logged in and
even seem to support HD streams much better.
2019-01-23 16:22:36 +01:00
c8ffdbe616
Send heartbeat every now and again
...
The heartbeat has to sent every now and again to keep the stream going.
Otherwise you will get a 403 after a few minutes when trying to access
the playlist.
2019-01-23 14:14:14 +01:00
19afa9ce79
Remove Fc2WebSocketClient
...
This is now handled in Fc2Model
2019-01-23 14:12:01 +01:00
64c82748dc
Count the websocket uses wth AtomicInteger
2019-01-22 22:42:46 +01:00
fc6aeff94a
Implemt special player handling for fc2live
2019-01-21 17:58:59 +01:00
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
ce839ee222
Implemented tipping for LiveJasmin
...
Add new class, which opens a chat websocket (relay server) and sends a tip message
2019-01-18 18:57:16 +01:00
86f086eb20
Create specialized HLS downloads for server and client
2019-01-18 16:32:47 +01:00
df47f4ba91
Add specialized HLS server download for LiveJasmin
...
The server-side HLS download has to refresh the master playlist URL like
the merged HLS donwload
2019-01-18 16:31:32 +01:00
3e4483aabd
Print out master playlist URL for LiveJasmin
2019-01-17 10:53:37 +01:00
ffcdb84714
Disable tipping for the time being
2019-01-15 17:10:30 +01:00
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
bf6b715642
Login every 30 min to LiveJasmin so that the session does not expire
2019-01-09 20:35:31 +01:00
45df31eb15
Properly end websocket download
...
End the websocket download if a model changes state from online. Also
properly close both sockets and set isAlive to false, if the download is
closed or fails
2019-01-09 20:34:25 +01:00
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
7483c8505a
Merge branch 'dev' into fc2
2018-12-23 13:58:50 +01:00
154a78660f
Add comment with URL for token balance
2018-12-23 13:57:44 +01:00
e66b75848f
Add download for the chunked http mp4 stream
2018-12-23 13:57:25 +01:00
b8d9f4bc19
Implement search for livejasmin
2018-12-22 22:33:01 +01:00
c364250440
Add follow / unfollow for livejasmin
2018-12-22 20:53:41 +01:00
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
4f3fd8a677
Add classes for LiveJasmin
2018-12-19 12:57:44 +01:00
2f09b1d517
Add own download class to manage the websocket connection
2018-12-18 13:18:49 +01:00
44b8deb27d
Map state connected to AWAY
2018-12-18 12:39:26 +01:00
0c35f4c219
Merge branch 'dev' into fc2
2018-12-17 23:01:21 +01:00
6dd7de9762
Fix: BongaCams search fails with JSON exceptions
2018-12-17 18:10:55 +01:00
eedb237923
Make sure, that the model ID is set
2018-12-17 17:22:21 +01:00
9958e04ef8
Make sure, that the model ID is set
...
When a Streamate model is added by URL, make sure, that the ID is
loaded, so that saving and loading works properly, since the ID is saved
as site specific data.
2018-12-17 17:13:15 +01:00
a0a083aaf6
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/io/HttpClient.java
2018-12-17 13:05:11 +01:00
1e47432714
Add origin stream source only, if mp4-ws sources are available
2018-12-16 17:21:11 +01:00
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
4d7409f443
Implement follow/unfollow and login with cookies
2018-12-14 20:25:57 +01:00
c7e07b4b26
Implement login and favorites tab
2018-12-14 17:36:24 +01:00
461e65ed84
Switch to much simpler JSON api
2018-12-14 14:58:12 +01:00
70f4fa930f
Implement search for Streamate
2018-12-14 13:42:20 +01:00
64c60eaeaa
Add determination of stream url and stream sources
2018-12-14 02:39:07 +01:00
52cdf8d601
Add classes and first code for Streamate
2018-12-13 23:48:16 +01:00
560e73c1dd
Reduce log level for unused message types
2018-12-13 20:51:14 +01:00
dc8a4d4190
Don't add model to models or update it, if uid is not set
2018-12-13 17:09:40 +01:00
168ad694ae
Remove debug log message
2018-12-13 01:11:22 +01:00
8039359455
Remove playlistUrl check from isOnline
...
isOnline contained a check for playlistUrl != null, because sometimes
the playlistUrl is null even though the model is online, but it prevents
the followed tab from working correctly
2018-12-12 22:05:46 +01:00
a68341de82
Add actions to MFC's table view
2018-12-12 18:08:39 +01:00
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
a5ec00c936
Add table for MFC which contains all models
2018-12-11 21:59:32 +01:00
be680a07f9
Map state password protected to private
2018-12-09 18:45:16 +01:00
2dc5fd4581
Add Event and EventReaction classes
2018-12-06 17:39:33 +01:00
093b36270a
Return at least ONLINE / OFFLINE, if the state is UNKNOWN
2018-12-05 21:01:01 +01:00
1970f08700
Return UNKOWN, if state is null
2018-12-05 20:59:51 +01:00
9f19b2c1fa
Merge branch 'dev' into notify
2018-12-05 16:08:55 +01:00
e6476e95ec
Add setting to ignore the upscaled video stream on MFC
2018-12-05 16:08:44 +01:00
42177b4399
Add enum to Model for the online states
2018-12-05 15:51:21 +01:00
0xb00bface