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

189 Commits

Author SHA1 Message Date
0xboobface 4f541c0570 Increased version to 1.18.0 2019-01-29 14:25:54 +01:00
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 8e2abd2f11 Implement createModelFromUrl for FC2Live 2019-01-28 14:44:45 +01:00
0xboobface 626d13f87a Implement createModelFromUrl 2019-01-28 13:32:42 +01:00
0xboobface 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
0xboobface ba0c456f19 Reduce log level for FC2Live websocket messages to TRACE 2019-01-27 15:17:30 +01:00
0xboobface 76c5c2e6c6 Remove log message 2019-01-27 14:10:45 +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 0f51be96c0 Implement FC2Live downloads for the server 2019-01-24 20:24:09 +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 a91819c2ca Extend the recording name to include seconds and milliseconds 
This is necessary, because there are models, who stream on different
sites with the same name as mentioned in #141. In that case it can
happen that a recording for each site would be started within the same
minute and one recording would overwrite the other.
 2019-01-24 19:00:02 +01:00
0xboobface 2c67b0b75c Merge branch 'jasmin' into dev 2019-01-24 15:52:38 +01:00
0xboobface aa093c0ec1 Delete all LiveJasmin cookies, if we are guests 2019-01-24 15:47:26 +01:00
0xboobface 0417fd6bfb Remove guest session cookies on start for LiveJasmin 2019-01-24 15:41:47 +01:00
0xboobface beeaca4beb Implement login and follow/unfollow 2019-01-24 15:24:05 +01:00
0xboobface 6bb6637683 Remove guest session cookies on start for LiveJasmin 2019-01-23 18:27:34 +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 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 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
0xboobface 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
0xboobface 19afa9ce79 Remove Fc2WebSocketClient 
This is now handled in Fc2Model
 2019-01-23 14:12:01 +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 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 43ef2bdf67 Add setting to disable playlist generation on the server 
Implementing #142.
This has feature has the disadvantage, that the recording is always detected as still
recording, because the finished state is assumed by the existence of the playlist file.
 2019-01-20 13:35:44 +01:00
0xboobface 11f2a3ef8d Increase version to 1.17.0 2019-01-19 16:06:50 +01:00
0xboobface 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
0xboobface 86f086eb20 Create specialized HLS downloads for server and client 2019-01-18 16:32:47 +01:00
0xboobface 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
0xboobface 3e4483aabd Print out master playlist URL for LiveJasmin 2019-01-17 10:53:37 +01:00
0xboobface dd2b8041d7 Add some text to explain, that LiveJasmin is not fully functional 2019-01-15 17:10:56 +01:00
0xboobface ffcdb84714 Disable tipping for the time being 2019-01-15 17:10:30 +01:00
0xboobface 07e0eb005b Create recordings dir, if it does not exist in getRecordingsFileStore 2019-01-11 15:35:01 +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 196b82dfa3 Consider empty recordings as too short 2019-01-09 20:34:52 +01:00
0xboobface 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
0xboobface 4516b8d787 Fix parsing of model name for recordings 2019-01-09 15:11:18 +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 3ab4ef785b Remove liveJasminSession 2018-12-25 18:05:00 +01:00
0xboobface 7483c8505a Merge branch 'dev' into fc2 2018-12-23 13:58:50 +01:00
0xboobface 154a78660f Add comment with URL for token balance 2018-12-23 13:57:44 +01:00
0xboobface e66b75848f Add download for the chunked http mp4 stream 2018-12-23 13:57:25 +01:00
0xboobface b8d9f4bc19 Implement search for livejasmin 2018-12-22 22:33:01 +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