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

1433 Commits

Author SHA1 Message Date
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 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 92b83b8411 Add jquery call to github API to determine the latest release 
This makes sure, that the latest version is used for the downloads, even
if I forget to update the download links.
 2019-01-21 15:08:34 +01:00
0xboobface 414d0abaff Updated download links to 1.17.0 2019-01-21 14:12:45 +01:00
0xboobface 6262d50f74 Log browser output 2019-01-20 17:58:10 +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 9cf5e4c41c Don't show login, if credentails are missing 2019-01-19 17:45:58 +01:00
0xboobface 11f2a3ef8d Increase version to 1.17.0 2019-01-19 16:06:50 +01:00
0xboobface 1de0af5350 Update changelog 2019-01-19 15:59:31 +01:00
0xboobface e2d3ef264e Add proxy support for the external browser 2019-01-19 15:31:13 +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 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 8e0e8855d0 Enable LiveJasmin for the server 
Since the HLS downloads suddenly work for LiveJasmin, we can enable it
for the server, too.
 2019-01-18 15:29:14 +01:00
0xboobface ceb65f0ff2 Logging 2019-01-17 12:20:29 +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 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 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 f2ac9e3657 Show error dialog if login fails 2019-01-09 15:12:21 +01:00
0xboobface 4516b8d787 Fix parsing of model name for recordings 2019-01-09 15:11:18 +01:00
0xboobface 58df996edc Merge branch 'master' into jasmin 2019-01-08 14:33:29 +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 739c43a43c
Merge pull request #136 from bounty1342/master 
Add Dockerfile
 2019-01-02 21:06:22 +01:00
bounty1342 17fcdb405a
Add info about docker 2019-01-01 22:43:13 +01:00
bounty1342 114098d16c
docker-compose to start the container 
Could also be run with docker run -d -p 8080:8080 -v /ctb/app/config:/root/.config/ctbrec/ -v /ctb/video:/root/ctbrec 0xboobface/ctbrec
 2019-01-01 22:38:07 +01:00
bounty1342 da4b0ec20c
DockerFile to build the server 
The following commande help build the server with the required version :
docker build --build-arg versionM3u8=0.2.7-CTBREC --build-arg version=1.16.0  --build-arg memory=-Xmx192m  -t bounty1342/ctbrec . --no-cache

Next update could select the branch or commit to ease testing.
 2019-01-01 22:32:59 +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 d29672bb21 Remove debug output 2018-12-23 13:58:08 +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 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 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