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

1158 Commits

Author SHA1 Message Date
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
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 2f09b1d517 Add own download class to manage the websocket connection 2018-12-18 13:18:49 +01:00
0xboobface 44b8deb27d Map state connected to AWAY 2018-12-18 12:39:26 +01:00
0xboobface 02c65bfdd1 Merge branch 'master' into fc2 2018-12-17 23:01:54 +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 6155f424de Update download links to 1.16.0 2018-12-17 19:23:36 +01:00
0xboobface d84771d2f9 Merge branch 'dev' 2018-12-17 19:20:19 +01:00
0xboobface ad71f0cf11 Make sure to not download segments multiple times 
For some reason streamate playlists can go back in time. This change
makes sure, that we don't download segments multiple times as a
consequence of the time travelling ;)
 2018-12-17 19:04:57 +01:00
0xboobface 75fedfcddd Disable minimum length in remote mode 2018-12-17 18:28:29 +01:00
0xboobface 6dd7de9762 Fix: BongaCams search fails with JSON exceptions 2018-12-17 18:10:55 +01:00
0xboobface 2a1dc77a89 Increase version number to 1.16.0 2018-12-17 17:53:53 +01:00
0xboobface cef3ca351e Update changelog 2018-12-17 17:52:13 +01:00
0xboobface b473782b92 Don't list recordings, which currently get deleted 2018-12-17 17:38:55 +01:00
0xboobface eedb237923 Make sure, that the model ID is set 2018-12-17 17:22:21 +01:00
0xboobface 8a8327a2a5 If loading site specific fails, print out the model name 2018-12-17 17:13:54 +01:00
0xboobface 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
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 5145ed0ce2 Update changelog 2018-12-17 13:00:46 +01:00
0xboobface bfbd6b1782 Open the player on double-click in the Recording tab 
Implements #121
 2018-12-16 20:38:58 +01:00