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

193 Commits

Author SHA1 Message Date
0xboobface d0a28aee2f Remove exludes from delete method 
The excludes is not used anymore, since the whole merging mechanism
has been removed.

Add more debug statements for the different delete statements.
 2018-09-09 14:40:08 +02:00
0xboobface 1c5bcaef35 Make sure the streamer is stopped 
The streamer has to be stopped, when the download is stopped or
terminates to release the file handle of the recording and to stop
the merge thread
 2018-09-09 14:30:21 +02:00
0xboobface 455dea97d9 Try not to write to sink, if the streamer has been stopped 2018-09-09 14:28:29 +02:00
0xboobface 17901901f9 Ignore empty recording directories in LocalRecorder.getRecordings() 2018-09-08 21:56:18 +02:00
0xboobface 528d7336e1 Simplify integration of mpegts-streamer 
Get rid of unneded thread complexity.
Use Queue.take() instead of poll() to avoid unnecessary looping and
the CPU load it causes.
 2018-09-08 21:53:39 +02:00
0xboobface 7efbeac565 Adjust detection of recording state to new download mechanism 2018-09-08 00:37:15 +02:00
0xboobface 89a69fa797 Change the name of a merged recording to model-date.ts 2018-09-08 00:17:40 +02:00
0xboobface 8fcc8e0f91 Reimplement the download so that it uses the BlockingMultiMTSSource 
This should create a transport stream file with proper continuity counters
and timestamps
 2018-09-07 23:59:37 +02:00
0xboobface cda1f25dc0 Remove segment mergers 
Segment mergers are not needed anymore. Segments get merged during the
recording or during the download from the server.
 2018-09-07 17:23:42 +02:00
0xboobface 7cc5764461 Add System property ctbrec.server.mode on server startup 
This property gets set by the server, so that we know,
if we are running in server mode or not
 2018-09-07 17:20:07 +02:00
0xboobface 3cf3f2751e Improved logging message 2018-09-07 16:51:12 +02:00
0xboobface 51d48bbe87 Remove unnecessary throw clause 
Rmove unnecessary throw IOException clause from the constructor of
InputStreamMTSSource
 2018-09-07 16:50:24 +02:00
0xboobface b91888f2ae Improve logging messages 2018-09-07 16:46:49 +02:00
0xboobface 85618289d5 Remove dead code 2018-09-07 15:44:22 +02:00
0xboobface 5df0c25a9d Organize imports 2018-09-07 15:43:59 +02:00
0xboobface 1d7dd0d0e8 Merge branch 'master' into mpegts-streamer 2018-09-07 15:20:06 +02:00
0xboobface 698ba72120 Integrate mpegts-streamer to save a recording to a single file 
Integrate a modified version of mpegts-streamer (https://github.com/igilham/mpegts-streamer)
Add BlockingMultiMTSSource to mpegts-streamer, which is used to add new InputStreamMTSSources
online for each segment.

Remove all settings and methods, which are needed for segment merging.
 2018-09-07 15:16:08 +02:00
0xboobface a147c1b26c Add check for JavaFX on start 
On startup check if the application is running on the OpenJDK JVM. If that is the case,
check that JavaFX is available (because OpenJDK comes without JavaFX, it has to be installed
separately). If it is not available, log an error what to do and exit.
 2018-09-07 14:31:18 +02:00
0xboobface 9ba0fd624f Save and restore window size, location and maximized state 
Save and restore window size, location and maximized state so that
the window opens in the exact same state as when it has been closed.
 2018-09-05 14:24:22 +02:00
0xboobface 7d36586b04 Make thumbnail size configurable 
Add combobox on the bottom of ThumbOverviewTab.
Add integer thumbWidth to the Settings to save and restore the selected
 value between sessions. Set the selected value for all thumbnails on
all tabs.
 2018-09-05 13:54:44 +02:00
0xboobface 22d32bcc64 Add possibility to switch the stream resolution for a recording 
Add the possibility to switch the stream resolution for a model, which
already is recorded by the recorder. This makes it more convenient to
switch the resolution, if you already have a bunch of models in the
recorder list.
 2018-09-04 16:50:38 +02:00
0xboobface c80f81d937 Add comment and log statement 2018-09-04 16:27:55 +02:00
0xboobface 0cb4b3d9a4 Move stream resolution selection dialog to its own class 2018-09-04 14:55:48 +02:00
0xboobface e33c6a3d94 Don't overwrite stream url index for a model on an update 
When the manual selection of stream resolution is enabled, the index of
the selected stream is saved in the model object. Don't overwrite this
value, if the model objects get updated, so that the value is persistent
even between sessions.
 2018-09-04 13:28:48 +02:00
0xboobface 79a1ccc011 Enable proxy authentication for SOCKS4 and HTTP 2018-08-30 13:18:19 +02:00
0xboobface cd827a0cb8 Ignore empty recordings directories 2018-08-30 13:04:35 +02:00
0xboobface cd5046b961 Add WebView to UpdateTab, which shows the chagelog 2018-08-29 14:27:21 +02:00
0xboobface 13c5bdfd40 Change labels in the merge settings 
Change labels in the merge settings to make it clearer, that the merge
directory also affects the manual merge
 2018-08-29 14:03:43 +02:00
0xboobface 154995a760 Add version number to window title 2018-08-29 14:02:16 +02:00
0xboobface 8d4ba6d513 Fix status switching between FINISHED and DOWNLOADING 
Do not change the status from an update, if it is in the status
DOWNLOADING. Reason: The FINISHED status is overwritten with
DOWNLOADING, if the recording is downloading. But during the update of
the recordings, it gets reset with the FINISHED status from the server
until it is overriden again.
 2018-08-28 17:16:44 +02:00
0xboobface f30d13609b Improve exception handling 
Make sure, the status is reset to FINISHED, if something goes wrong
while downloading, so that the context menu is reactivated
 2018-08-28 17:13:35 +02:00
0xboobface 1383199532 Rename generatingPlaylistProgress to progress 
Rename generatingPlaylistProgress to progress, since it is used for
merging and downloading, too
 2018-08-28 17:12:46 +02:00
0xboobface 89a1737536 Improved logging 2018-08-28 17:12:09 +02:00
0xboobface 4821ba42b8 Close http response in update checker 2018-08-28 15:22:34 +02:00
0xboobface 32e060ceb2 Add update check 
Add update check, which checks the github API to retrieve the latest
version and opens a tab, if new update is available.
 2018-08-28 14:48:00 +02:00
0xboobface 4c32dc84f5 Fix status and progress update in recordings table 
Fix status and progress update in recordings table, which didn't work
correctly for the merge process.
 2018-08-28 13:04:02 +02:00
0xboobface 4f1f9ce5d5 Introduce interface for SegmentMerger 
Extract public methods of SegmentMerger to an interface, so that
different implementations are possible. This is a first try to see, if
an FFmpeg merger would work reliably.
 2018-08-28 13:02:49 +02:00
0xboobface 431724ce14 Extract DevNull OutputStream to its own class 
Extract DevNull to its own class, so that it can be used by other
classes.
 2018-08-28 12:57:55 +02:00
0xboobface 3a718cc92c Remove System.out.println 2018-08-27 18:41:53 +02:00
0xboobface e09d0c35aa Add proxy settings 
Add titled pane to settings tab to configure a proxy. Assign the proxy
settings on start to the according System properties (see
https://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html#Proxies),
so that they get picked up by okhttp, HttpUrlConnection etc.
 2018-08-27 18:15:40 +02:00
ctbrechelper 4a48f9a844
Fix merge segments and keep segments with disabled auto merge 
Disabled AutomergeKeepSegments will result in an automatic deletion of the files, so even when the user clicks "keep segments", they will be removed by the automergeKeepSegments flag
 2018-08-27 11:27:14 +02:00
0xboobface 18b785811b Fixed memory leak in ThumbOverviewTab 
The filteredThumbCells list was never cleared and thus grew over time.
 2018-08-16 17:20:58 +02:00
0xboobface 3620a305bf The ImageView in ThumbCell is not cached anymore, because it does not 
improve performance and uses up memory
 2018-08-16 17:20:05 +02:00
0xboobface ebe717f0e8 Made segment merger more robust 2018-08-16 13:46:39 +02:00
0xboobface 5efee697b2 Improved exception handling and logging 2018-08-16 13:41:36 +02:00
0xboobface d7a9e22bc3 Handle empty playlists as invalid 2018-08-16 13:39:55 +02:00
0xboobface 306c9b6448 Increased window height to 800 2018-08-15 12:42:56 +02:00
0xboobface c5b34e9577 Added settings to record all followed models and to allow multiple 
players at once
 2018-08-15 12:42:36 +02:00
0xboobface 94bede6367 Added setting to record all followed models 2018-08-13 18:29:44 +02:00
0xboobface e00c653c23 Logging 2018-08-13 18:29:13 +02:00
0xboobface 16efe49324 Fixed bug in the creation of the JSON request 2018-08-13 18:28:15 +02:00
0xboobface c64359d455 Allow multiple player processes at once 2018-08-13 18:27:23 +02:00
0xboobface f485d3255d Improved logging 2018-08-09 21:00:17 +02:00
0xboobface 40d89fd3a1 Added assembly descriptor for win32 2018-08-09 15:31:00 +02:00
0xboobface d6e73aef9a Added setting to move merged files to a separate directory 2018-08-09 14:43:27 +02:00
0xboobface 6357447a4a Removed some unnecessary nested locks 2018-08-05 17:06:13 +02:00
0xboobface dcbea85f76 Grouped settings in TitledPanes 2018-07-26 16:08:39 +02:00
0xboobface 7cd559ac63 Logging 2018-07-25 22:10:08 +02:00
0xboobface ceb9b2d3d9 Simplified checks in OnlineMonitor 2018-07-25 21:41:11 +02:00
0xboobface f1adead851 Improved resolution requests 2018-07-25 20:21:51 +02:00
0xboobface a9178a2d21 Disabled the recording animation, because it takes up a lot of CPU 2018-07-25 17:41:03 +02:00
0xboobface 1b9b0998e1 Added plausibility check for resolution 
If a model is online and the resolution is 0, we remove that value from
the cache, so that it is requested again and we hopefully get a good
value.
 2018-07-25 14:55:02 +02:00
0xboobface fc4ce39381 Added tooltip to filter bar 2018-07-25 14:17:38 +02:00
0xboobface 6136f095ec Made sure to close okhttp responses properly to avoid resource leaks 2018-07-25 14:06:30 +02:00
0xboobface c3d916e033 Removed logging 2018-07-25 14:05:54 +02:00
0xboobface 73159748cd You can now filter by resolution 
If the display of stream resolution is enabled in the settings, the filtering now takes the resolution into account.
So you can filter for "1080" and only get streams with a resolution of 1080p.
 2018-07-25 13:40:30 +02:00
0xboobface 8aad31965d Reenabled initial login on startup 2018-07-25 13:40:05 +02:00
0xboobface dedbc30a46 Assume model is offline, if an exception occurs while checking the 
online state.
 2018-07-14 13:05:11 +02:00
0xboobface 6ce84ad1bb Bumbed version to 1.2.0 2018-07-12 19:23:30 +02:00
0xboobface 06d1630375 Use okhttp for all http connections 2018-07-11 21:25:50 +02:00
0xboobface 98cefacae3 Added possibility to select the stream quality. 
The Settings tab now contains a checkbox to enable manual stream
selection. If not checked, the stream with the highest quality is
selected.
 2018-07-11 20:41:22 +02:00
0xboobface 48d2fad306 Allow delete only, if the status of the recording is FINISHED 2018-07-11 19:14:13 +02:00
0xboobface ba389744d7 Added event handler for the delete key 2018-07-11 18:48:52 +02:00
0xboobface 7a1a32b230 Removed debugging delay in delete() 2018-07-08 11:02:59 +02:00
0xboobface b12644cfbf Added auto-merging for local mode 
In local mode files can be automatically merged after a recording is
finished. This can be configured in the settings.
 2018-07-07 18:04:56 +02:00
0xboobface e6807acec6 Cleaned up logback config 2018-07-07 18:01:04 +02:00
0xboobface b25c529b9c Moved PlaylistGenerator one package up 2018-07-07 17:12:18 +02:00
0xboobface 160aaa51a1 Removed JavaFX code from Config 2018-07-07 14:18:20 +02:00
0xboobface 32172fe203 Created abstract servlet to handle HMAC 
Implemented HMAC authentication in HlsServlet, but disabled it, because
it does not make sense, if you want to support streaming. Also, the path
of recordings can only be obtained by guessing without the HMAC key.
 2018-07-07 14:05:07 +02:00
0xboobface aaaca23427 Print recordings dir to log on initialization 2018-07-07 13:36:18 +02:00
0xboobface bb6ba48f49 Implemented HMAC authentication in RemoteRecorder 2018-07-07 13:23:00 +02:00
0xboobface d62bba5599 Implemented HMAC authentication in RecorderServlet 2018-07-07 12:50:21 +02:00
0xboobface 8c7385229f Improved GUI response time 
The GUI reponds faster to the start and stop action when using the
RemoteRecorder
 2018-07-06 21:15:12 +02:00
0xboobface b88803e30c Fixed ordering bug for recorded models 2018-07-06 13:47:03 +02:00
0xboobface 2fb9d5cbcc Improved painting and sorting of recorded models. 2018-07-06 13:37:54 +02:00
0xboobface 2fcc85853f Fixed bug in remote recorder, which caused list of recorded models to be 
null
 2018-07-06 13:37:10 +02:00
0xboobface 57c5cc7094 Remove resolution tags, when the option is disabled 2018-07-06 13:12:32 +02:00
0xboobface 4c4f885844 Added resoltion tag to thumb cell 
Added the possibility to display the video resolution for each model in
the top right corner of the thumb. Can be toggled in the settings.
 2018-07-06 13:05:42 +02:00
0xboobface ea3715134e Display "Follow"/"Unfollow" depending on the active tab 2018-07-05 16:26:55 +02:00
0xboobface 114e676917 Added textfield to recording tab, so that you can add models manually 2018-07-03 15:00:55 +02:00
0xboobface a0bf1fbfe7 Added buymeacoffee to donate tab 2018-07-02 18:22:34 +02:00
0xboobface 351d873e39 Added crypto coins to donate section 2018-07-02 14:51:46 +02:00
0xboobface 1ab902892d initial import 2018-07-01 17:38:53 +02:00