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

812 Commits

Author SHA1 Message Date
0xb00bface 5fa72eaaa0 Add setting to define the download file name 2020-09-26 19:52:09 +02:00
0xb00bface 9ed4ded258 Disable post-processing steps in remote mode 2020-09-26 19:12:16 +02:00
0xb00bface 93deeb3e52 Remove unused postProcessing setting 2020-09-26 17:22:42 +02:00
0xb00bface 30021d184d Add DeleteTooShort post-processor 2020-09-24 11:35:37 +02:00
0xb00bface f6afed3717 Add script post-processor 2020-09-23 18:52:30 +02:00
0xb00bface 67ff48e2dc Pass RecordingManager to post-processors 2020-09-22 22:15:28 +02:00
0xb00bface e1bce0acf5 Improve handling of the orignal and pp files 2020-09-22 12:38:21 +02:00
0xb00bface bf39d9a639 Implement proper handling of the orignal and pp files 
If a copy is created, the original file is not touched anymore.
Otherwise the original file is used and the post-processing process is not repeatable anymore, or at least the results might get unpredictable
 2020-09-20 18:14:24 +02:00
0xb00bface 90192d9b8f Fix server stuff for new recording path handling 2020-09-13 19:54:43 +02:00
0xb00bface 4f526fd13e Store absolute path in metadata file instead of path relative to rec dir 2020-09-13 17:34:58 +02:00
0xb00bface 4f7d080f56 Add more pp steps 2020-08-30 13:41:03 +02:00
0xb00bface 6b81ef6870 Merge branch 'dev' into pp 2020-08-24 15:18:02 +02:00
0xb00bface 000ea174c2 Add renamer 2020-08-23 13:38:43 +02:00
0xb00bface bdcf1bee00 Implement Renamer post-processor 2020-08-23 13:37:59 +02:00
0xb00bface c7e39fdd98 Fix MV Live models not showing up as recording 
MV Live models with spaces in the name would not show up as recording.
 2020-08-23 12:46:24 +02:00
0xb00bface 17a32cd928 Add first configurable PP step 2020-08-22 18:35:54 +02:00
0xb00bface 7bb33568cf Add new event for when the disk space is exhausted 2020-08-21 17:09:07 +02:00
0xb00bface 151c58fa9f Start event system immediately after start 
Instead of waiting for the online monitor to do it'S first run, we not
ignore model state changes from unknown to online
 2020-08-21 15:57:22 +02:00
0xb00bface 217b56b88c Set online state in all update services 2020-08-20 17:32:09 +02:00
0xb00bface da3f0632e2 Set version to 3.9.0 2020-08-19 17:21:48 +02:00
0xb00bface 7c641c7b63 Add doc page with all video tutorials 2020-08-19 17:13:06 +02:00
0xb00bface 1a1a904ee2 Print out the whole stack trace included cause chain 2020-08-19 14:38:23 +02:00
0xb00bface 8cfeb853a7 Show shutdown confirmation dialog only in standalone mode 2020-08-19 14:27:37 +02:00
0xb00bface 7e2924d780 Add confirmation dialog for shutdown 
Show confirmation dialog when a shutdown is requested and there are
recordings in progress. The user now can decide to shutdown immediately,
shutdown gracefully or leave the app running
 2020-08-19 12:45:47 +02:00
0xb00bface 17f1c3aec6 Add confirmation dialog for pause all and resume all 2020-08-19 11:42:50 +02:00
0xb00bface 67cbc0cadf Add site config UI for MVLive 
It contains only a checkbox to disable it
 2020-08-18 20:30:59 +02:00
0xb00bface 096ed7a734 Implement proper online check and add search 2020-08-18 19:58:48 +02:00
0xb00bface 00f6a0fa0a Show model state, if it is not equal to ONLINE 2020-08-18 19:58:20 +02:00
0xb00bface db186e65f4 Merge branch 'dev' into manyvids 
# Conflicts:
#	common/src/main/java/ctbrec/io/HttpClient.java
 2020-08-16 17:00:43 +02:00
0xb00bface dbd9e00600 Fix Streamate followed tab once again 2020-08-16 15:00:49 +02:00
0xb00bface 4139e42ce2 Set version to 3.8.6 2020-08-16 14:16:38 +02:00
0xb00bface fe9ac0680d Add context menu to logging table 2020-08-16 13:09:37 +02:00
0xb00bface 2126b61e99 Add logging tab 2020-08-09 18:29:04 +02:00
0xb00bface daefe1a7d4 Add setting to disable online check for paused models 2020-08-09 14:03:52 +02:00
0xb00bface 0fe16f8ff8 Add setting to disable online check for paused models 2020-08-09 12:27:04 +02:00
0xb00bface c02d9562bf Set version to 3.8.5 2020-08-09 11:05:56 +02:00
0xb00bface ee302e49a4 Distinguish between performer_id and display_name for LiveJasmin models 2020-08-09 11:04:24 +02:00
0xb00bface caf329eb23 Change look of the model table in the web interface 2020-08-08 20:11:48 +02:00
0xb00bface e55daa0772 Add GUI and remote support for temporary recordings 2020-08-08 17:51:03 +02:00
0xb00bface 729319dfd2 Add mechanism to record a model only up to a certain timestamp 2020-08-08 15:28:29 +02:00
0xb00bface 48964cc85f Fix Stripchat followed tab 2020-07-29 20:20:45 +02:00
0xb00bface e2fdda32db Remove JAVA_HOME variable 2020-07-26 16:00:12 +02:00
0xb00bface 81643545d2 Set version to 3.8.4 2020-07-26 15:42:36 +02:00
0xb00bface 5629f5103e Update exe meta information 2020-07-26 11:08:44 +02:00
0xb00bface 64c6b9aa4f Enable rerun PP for multiple recordings 2020-07-26 11:07:55 +02:00
0xb00bface eaa26fa1bf Reduce flexmark dependencies 2020-07-22 19:45:12 +02:00
0xb00bface c80230cee7 Add support for xHamsterLive 2020-07-20 18:44:25 +02:00
0xb00bface bc872b1ed5 Set version to 3.8.3 2020-07-19 18:23:32 +02:00
0xb00bface d96b9a1380 Escape passwords before injecting them 
Escape quotes in passwords before injecting them into the external
browser, so that the injected javascript is valid and doesn't break
 2020-07-19 16:35:38 +02:00
0xb00bface 7462d68d7b Add external login dialog for stripchat 
This also enables us to support xhamsterlive
 2020-07-19 15:17:31 +02:00
0xb00bface e202c946ac Fix CamSoda followed tab 2020-07-16 21:28:47 +02:00
0xb00bface 4b2e17d0b1 Fix Cam4 favorites tab 2020-07-16 19:51:14 +02:00
0xboobface ed26228d7b Increase version number to 3.8.2 2020-07-12 13:11:19 +02:00
0xboobface 49feade0c0 Empty table, if tab is deselected 2020-07-12 13:08:55 +02:00
0xboobface fa3512621c Release resources, if the tab is deselected 
This allows the garbage collector to work properly and reduces the
minimum heap size
 2020-07-12 12:39:15 +02:00
0xboobface 3b9fb87d04 Fire recording finished event for downloads 2020-07-12 11:33:53 +02:00
0xboobface 6600b0da94 Get the authentication and the stream working 2020-07-10 22:12:28 +02:00
0xboobface ed0f5476b5 Merge branch 'dev' into manyvids 2020-07-10 18:09:26 +02:00
0xboobface 716c75c3d2 Add disabling of settings, if the don't make sense 2020-07-05 20:33:47 +02:00
0xboobface 9395431a6f Remove pref size from list view 2020-07-05 15:44:00 +02:00
0xboobface faf3d469f0 Make layout grow horizontally 2020-07-05 15:35:17 +02:00
0xboobface 6117d24e13 Remove old settings tab and obsolete dialogs 2020-07-05 15:09:58 +02:00
0xboobface b6a81c29b9 Made prefs a local variable 2020-07-05 14:34:56 +02:00
0xboobface dfb0ce869a Expand navigation tree, when GUI is created 2020-07-05 14:25:17 +02:00
0xboobface 83775c805a Add all settings to the new settings panel 2020-07-05 14:02:15 +02:00
0xboobface e7349b2118 Set version to 3.8.1 2020-07-03 19:12:18 +02:00
0xboobface 8bd091993e Disable new settings tab for the time being 2020-07-03 19:01:32 +02:00
0xboobface 4205cb6ff2 Use rolling file appender for the log files 2020-06-30 20:48:48 +02:00
0xboobface 09337aa59a Update Java class with newer Java versions 2020-06-30 20:45:24 +02:00
0xboobface 4f52259aa9 Add mouse click behaviour to range slider 2020-06-30 20:28:44 +02:00
0xboobface 3382c7ff54 Fix initialization of the range slider 2020-06-30 19:40:08 +02:00
0xboobface 90300473bc Add more settings 2020-06-28 12:58:39 +02:00
0xboobface ec1a0826e0 Add new settings tab implementation 2020-06-27 18:40:41 +02:00
0xboobface d3d9662ec5 Add websocket client 2020-06-20 11:17:19 +02:00
0xboobface 58663d8e8d Adjust MVLive code to API changes 2020-06-14 15:12:51 +02:00
0xboobface 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
0xboobface c16baf94e5 Disable resolution range slider in remote mode 2020-06-14 12:51:19 +02:00
0xboobface fa37266485 Fix IndexOutOfBoundsException in RangeSLiderBehavior 2020-06-14 11:21:33 +02:00
0xboobface 56a41df4e7 Update changelog 2020-06-13 20:51:24 +02:00
0xboobface 6e25f98b2b Add range slider for the recording resolution 2020-06-13 20:08:25 +02:00
0xboobface 229fc1f432 Add possibility to add notes to recordings 2020-06-13 19:32:00 +02:00
0xboobface f45429a01e Set bandwidth throughput to 0 if no model is recorded 2020-06-12 18:46:50 +02:00
0xboobface f4ad1a4f61 Move ConfigUI interface from common module to client 2020-06-12 18:25:28 +02:00
0xboobface 447ab46e39 Code cleanup 2020-06-12 18:24:44 +02:00
0xboobface 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
0xboobface cd6175a7eb Add BandwidthMeter, which tracks the current bandwidth usage 2020-06-12 18:21:32 +02:00
0xboobface bd48d6bf9c Set version to 3.8.0 2020-06-12 18:10:56 +02:00
0xboobface 44fd340323 Implement loading of the config into the webpage 2020-06-11 19:58:59 +02:00
0xboobface 0ed6d93d30 Set version to 3.7.3 2020-06-09 19:36:17 +02:00
0xboobface 7e4a6393b0 Set version to 3.7.2 2020-06-07 13:57:15 +02:00
0xboobface acd6126619 Add "New" tab to each site where it was missing 2020-06-07 13:53:54 +02:00
0xboobface a67ef7f4fd Revert "Clear selection after deleting recordings" 
This reverts commit 9f92e05942.
 2020-06-01 10:36:32 +02:00
0xboobface c8614d7208 Set version to 3.7.1 2020-05-31 18:44:04 +02:00
0xboobface 1bea13dc05 Improve server download progress calculation 2020-05-31 17:20:25 +02:00
0xboobface b87f090ac3 Add max resolution setting for the player 2020-05-31 14:50:12 +02:00
0xboobface 9f92e05942 Clear selection after deleting recordings 2020-05-30 17:58:14 +02:00
0xboobface 258334b637 Add setting to remove recordings after post-processing 2020-05-29 19:50:03 +02:00
0xboobface 62be5795f4 Add video tutorial on how to rename files with PP 2020-05-23 14:50:01 +02:00
0xboobface 7912b3b727 Check for running downloads on shutdown 
Check for running downloads and ask the user to exit anyway to prevent
half downloaded files.
 2020-05-23 13:49:50 +02:00
0xboobface 9eea66d94f Remove the uid field from ShowupModel 2020-05-20 19:37:01 +02:00
0xboobface 63b2985e37 Fix add model by name suggestions 2020-05-20 19:36:42 +02:00
0xboobface 33a0094b19 Adjust to Stripchat API changes 2020-05-20 18:17:46 +02:00
0xboobface 66b37b65c0 Set version to 3.7.0 2020-05-16 22:20:06 +02:00
0xboobface 1a5c32167e Preparation for Showup login 2020-05-16 21:30:25 +02:00
0xboobface 6c85a2a493 First working version of Showup.tv 2020-05-16 16:28:44 +02:00
0xboobface 57125b4820 Fix possible NPE in RecordedModelsTab 2020-05-16 11:21:23 +02:00
0xboobface b70626c2b7 Fix creation of player command line 2020-05-16 11:20:41 +02:00
0xboobface e04b528edd Replace patreon button with Ko-fi 2020-05-13 20:03:18 +02:00
0xboobface bd92c315fb Set version to 3.6.4 2020-05-13 18:46:24 +02:00
0xboobface 2956098d2c Reactivate "rerun post-processing" for standalone 2020-05-10 12:19:06 +02:00
0xboobface e6dae3b2af Set version to 3.6.3 2020-05-10 12:03:32 +02:00
0xboobface cd5172613e Fixed player start for recordings starting with a dash 2020-05-03 15:32:54 +02:00
0xboobface 8cdc2a4a56 Set version to 3.6.2 2020-05-02 14:43:20 +02:00
0xboobface 7494b8dd30 Fixed minor bug in ActionSettingsPanel 
Actions would get added to the combobox each time you click on "Add"
 2020-05-02 13:40:12 +02:00
0xboobface f285d2ba53 Add -- to player command line 
... to separate the command line args from the file name. Some
recordings can start with '-' , which would be interpreted as argument
otherwise.
 2020-05-02 12:42:48 +02:00
0xboobface 04bfd9805d Update configuration file config 2020-04-30 16:42:30 +02:00
0xboobface b402bb0df7 Set version to 3.6.1 2020-04-28 22:07:38 +02:00
0xboobface a4d517aa25 Add button to jump to first page 2020-04-23 18:32:14 +02:00
0xboobface a37a018159 Remove outdated settings for MFC 2020-04-13 19:43:33 +02:00
0xboobface aa42e82153 Set version to 3.6.0 2020-04-13 18:53:29 +02:00
0xboobface ae6fa229e7 Add user-agent agent header to every http request in MFC classes 2020-04-13 18:42:57 +02:00
0xboobface 979c8b0a91 Add Girls HD tab for Stripchat 2020-03-28 13:08:24 +01:00
0xboobface 915be1d4fc Save column order in tables 2020-03-22 13:54:31 +01:00
0xboobface dc30f7da51 Increase models per page for Streamate favorites 2020-03-20 15:18:26 +01:00
0xboobface 0107f1d008 Take model description into account when filtering 2020-03-19 18:40:18 +01:00
0xboobface 8ae30ab6eb Move user agent settings to general panel 2020-03-19 15:54:00 +01:00
0xboobface ad06218b78 Improve filter updates 
Filter matches are now updated as soon, as the stream resolution has
been determined for a model
 2020-03-19 15:21:57 +01:00
0xboobface 243d2757b0 Set version to 3.5.0 2020-03-19 15:01:34 +01:00
0xboobface dd47d121bc Improve caching of stream resolution info 2020-03-19 13:59:52 +01:00
0xboobface a5732cb572 Add config setting for the HTTP User-Agent header 2020-03-17 20:47:15 +01:00
0xboobface d716354dc1 Add config setting for the number post-processing threads 2020-03-17 20:20:11 +01:00
0xboobface ff9ff8f40f Add dialog to specify media player params in the settings 2020-03-16 20:51:09 +01:00
0xboobface 6f57579041 Add pinning for recordings 
Recordings can now be set to pinned. Pinned recordings cannot be
deleted.
 2020-03-16 16:10:09 +01:00
0xboobface 6f278b6c49 Code cleanup 2020-03-16 14:27:48 +01:00
0xboobface 30a8a50402 Disable servlet context path, if the recording mode is local 2020-03-16 14:14:42 +01:00
0xboobface 76794e588e Add negation (!) to filter bar 
Filter terms can now be negated with !
 2020-03-16 13:41:06 +01:00
0xboobface 4c8f64bfeb Update help section 2020-02-29 15:19:45 +01:00
0xboobface c580a74e49 Update Q&A 2020-02-29 11:28:43 +01:00
0xboobface 3636d34d22 Set version to 3.4.0 2020-02-27 20:59:53 +01:00
0xboobface 46bd8667c8 Separate site name and displayed title 2020-02-26 21:40:58 +01:00
0xboobface 8cafc7124f Add search for Stripchat 2020-02-23 19:36:14 +01:00
0xboobface e4b9da7685 First working implementation for Stripchat 2020-02-23 18:47:37 +01:00
0xboobface 4dcf9944f8 Set version to 3.3.0 2020-02-22 17:57:03 +01:00
0xboobface 71be9b3665 Improve support for server-side single files 2020-02-22 17:40:22 +01:00
0xboobface 208aa16c80 Add settings for FFmpeg 2020-02-22 15:40:01 +01:00
0xboobface 855604aab5 Set suggested file suffix to ffmpegFileSuffix setting 2020-02-22 14:48:45 +01:00
0xboobface 4f9c1606fc Fix download of recordings 2020-02-22 14:26:50 +01:00
0xboobface 23c97cd2c0 Add quotes around paths in pp script 2020-02-22 12:28:45 +01:00
0xboobface d2f490f8f6 Add FFmpeg downloaders 2020-02-22 11:20:10 +01:00
0xboobface 5c0e1ae044 Fix sonar lint issues 2020-02-22 11:15:51 +01:00
0xboobface e98a3bc7c2 Set version to 3.2.1 2020-02-16 17:04:46 +01:00
0xboobface e03dd3aabe Extend the beta description text 2020-02-16 15:52:22 +01:00
0xboobface b18a32ede3 Fix LiveJasmin followed tab 2020-02-16 13:28:33 +01:00
0xboobface 9a4461a0d1 Set version to 3.2.0 2020-02-01 10:03:56 +01:00
0xboobface 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
0xboobface d6574a63b9 Jump to next recording with letter keys 2020-01-26 16:34:51 +01:00
0xboobface dbeb814465 Add "Ignore" to context menu of RecordedModelsTab 2020-01-26 16:20:14 +01:00
0xboobface 90cb08a3cc Code cleanup 2020-01-26 16:02:53 +01:00
0xboobface 5083d77ffe Move tab related stuff to own package 2020-01-26 15:07:30 +01:00
0xboobface c1cbcc8554 Jump to next model with letter keys 2020-01-24 20:37:28 +01:00
0xboobface f5ef7c7cc1 Remove direct messages from news stream 2020-01-11 13:10:12 +01:00
0xboobface b66989fe85 Set version to 3.1.0 2020-01-11 11:30:02 +01:00
0xboobface 3bb161c055 Add columns "last recorded" and "last seen" to models table 2020-01-05 16:02:22 +01:00
0xboobface 60826323f3 Code cleanup 2020-01-04 16:54:25 +01:00
0xboobface d82c3b490b Implement recording priorities for RemoteRecorder 2020-01-04 15:30:54 +01:00
0xboobface b2138ca99b Fix NoSuchFileException caused by URL encoding 
The Jar URL has to get URL-decoded before it can be used as a path
 2020-01-03 19:20:34 +01:00
0xboobface 4d6e74562c Add recording priority for models 
Models with high priority will be favored over models with low priority.
Recordings for models with low priority might even get stopped to free
up a slot for a model with a higher priority
 2020-01-03 19:06:05 +01:00
0xboobface 8ae41142d1 Add menu entry to open the recording dir of a model 2020-01-03 15:13:57 +01:00
0xboobface 84428f8aac Fix: Changed variable names broke the update check 2020-01-03 14:11:19 +01:00
0xboobface 808810b6d6 Set version to 3.0.4 2020-01-03 12:43:07 +01:00
0xboobface b12f3e5789 Add setting to switch between DASH and HLS for MFC 2020-01-03 12:27:06 +01:00
0xboobface 41e2e5ce54 Code cleanup 2020-01-03 12:26:37 +01:00
0xboobface e14296bc1b Add a column, which shows, if a model uses webrtc 2020-01-03 12:25:33 +01:00
0xboobface 424d046b67 Fix possible NPE in filter function 2020-01-03 12:24:02 +01:00
0xboobface d7eccbf648 Add ignore menu item, which had been removed accidentally 2020-01-01 23:37:59 +01:00
0xboobface 127ed0ab91 Add manual refresh to context menu of thumb overviews 2019-12-31 15:14:55 +01:00
0xboobface 46797a8467 Add possibility to export and import the ignore list 2019-12-31 14:32:01 +01:00
0xboobface 549133e6a7 Improve exception handling for update check 2019-12-31 14:28:54 +01:00
0xboobface 1ec2cf5286 Code cleanup 2019-12-31 13:24:59 +01:00
0xboobface 25fc51521a Scale down images to 360px to prevent OutOfMemoryErrors 2019-12-31 12:54:27 +01:00
0xboobface abef15a5f7 Code cleanup 2019-12-31 12:53:50 +01:00
0xboobface 627eb585c8 Fix resource leak in update check 2019-12-31 12:10:44 +01:00
0xboobface f312d5ed58 Add possibility to switch back to best stream quality 2019-12-30 19:34:58 +01:00
0xboobface b1e312aaac Code cleanup 2019-12-30 18:35:27 +01:00
0xboobface 499708ffcf Set version to 3.0.3 2019-12-30 14:52:04 +01:00
0xboobface e153a967f7 Code cleanup 2019-12-29 15:16:08 +01:00
0xboobface 5d9762a8f7 Cleanup loggers 2019-12-29 15:07:27 +01:00
0xboobface 1ab771305e Remove jobs from queue when tab is deselected 2019-12-29 15:06:39 +01:00
0xboobface 702de3b772 Use model url for key in resolution cache 2019-12-29 15:06:17 +01:00
0xboobface 4dd99a6dd3 Fix: Filter was negated by refactoring 2019-12-29 14:24:55 +01:00
0xboobface 963b5ea89b Remove log level for "streamer" 2019-12-28 19:52:46 +01:00
0xboobface 738aca8a06 Allow recordings in state WAITING to be deleted 2019-12-28 16:47:00 +01:00
0xboobface fc42b21a70 Code cleanup 2019-12-27 19:34:35 +01:00
0xboobface 87943fac95 Fix bug in moveActiveRecordingsToFront 
There was a bug in moveActiveRecordingsToFront, which caused the models
to rotate their positions

Also some refactoring to reduce method complexity.
 2019-12-27 19:01:51 +01:00
0xboobface 296396f2d3 Set version to 3.0.2 2019-12-27 15:17:53 +01:00
0xboobface 87b0ce0d21 Use constants from HttpConstants 2019-12-27 15:14:55 +01:00
0xboobface 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
0xboobface afe482dfe1 Change log levels in determineResolution() to debug 2019-12-26 23:43:13 +01:00
0xboobface a561ab08e4 Remove reference to local file system 2019-12-26 21:46:10 +01:00
0xboobface 33c298d558 Set version to 3.0.1 2019-12-26 21:46:06 +01:00
0xboobface 4049f8859c Fix context menu to rerun pp 2019-12-26 21:46:01 +01:00
0xboobface bce8de01fe Made logging less verbose for the resolution tag 2019-12-26 21:45:46 +01:00
0xboobface 9df30b3342 Attach HMAC only to recordings 2019-12-22 12:11:32 +01:00
0xboobface fde24e80ea Use JSON again to parse the models 2019-12-21 21:04:49 +01:00
0xboobface 45d18c754a Fix followed page for MFC 2019-12-21 19:54:49 +01:00
0xboobface 2fb2c932aa Fix "rerun pp" for MFC dash downloads 2019-12-21 18:59:31 +01:00
0xboobface 6fb1ee5153 Fix boolean condition for "rerun pp" context menu entry 2019-12-21 17:52:50 +01:00
0xboobface a4b805c038 Set version to 3.0.0 2019-12-21 14:33:45 +01:00
0xboobface 4eeb101cbb Fix recording downloads from server to client 2019-12-21 14:30:57 +01:00
0xboobface e37c869695 Merge branch 'dev' into mp4-streaming 2019-12-17 21:27:16 +01:00
0xboobface e734d46e9c Add gitattributes and run initial normalization 2019-12-17 21:13:18 +01:00
0xboobface b9f463d0dd Bump version to 2.3.0 2019-12-08 19:04:22 +01:00
0xboobface 034fe81081 Use FFmpeg to merge HLS segments 2019-12-07 16:58:56 +01:00
0xboobface eba7b085b8 Add FFmpeg to assembly 
- Add FFmpeg to the assembly
- Remove assembly descriptors without JRE
 2019-12-07 13:41:25 +01:00
0xboobface 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
0xboobface 98c1731c8e Add DASH download logger entry to logback config 2019-12-07 11:56:12 +01:00
0xboobface d8d0e4d5af Add ffmpeg static binaries dir to gitignore 2019-12-07 11:55:30 +01:00
0xboobface 00ea43c8b3 Move HLS related classes ot own package 2019-11-30 16:40:01 +01:00
0xboobface 43dfc4e59c Set versions in maven POMs 2019-11-23 17:14:44 +01:00
0xboobface 011e8c2f29 Improve thread interrupt and lock handling 2019-11-23 17:13:27 +01:00
0xboobface 84a02d7432 Use liveState to determine, if a model is online 2019-09-21 12:50:05 +02:00
0xboobface 7319b6251a Fix favorites page for Streamate 
The URL and JSON response for favorites had changed
 2019-09-21 12:00:12 +02:00
0xboobface 372fce2899 Update the RunningTheServer page 2019-08-10 20:24:27 +02:00
0xboobface 7c29bba16e Set version to 2.2.0 2019-08-10 18:25:40 +02:00
0xboobface f12a20a15e Add support for TLS and changing the context path 2019-08-10 17:45:13 +02:00
0xboobface 8450ddd98c Increase version to 2.1.0 2019-07-27 18:27:54 +02:00
0xboobface bc724b2f42 Add setting to switch on/off the server webinterface 2019-07-27 17:55:42 +02:00
0xboobface 88040e9a0b Disable MyFreeCams for the time being 2019-07-21 10:46:46 +02:00
0xboobface 1db79541ff Add web interface for the server 2019-07-21 10:39:00 +02:00
0xboobface ef19e04751 Fix NPE in DirectorySelectionBox 2019-07-05 18:09:50 +02:00
0xboobface 2bedb6497a Revert switch to JSON parsing 
The switch to parse the JSON array at the end of the page is not
reliable because the page does not always contain the array.
 2019-06-29 18:08:45 +02:00
0xboobface 798f950a95 Refresh model online state before switching resolutions 2019-06-11 19:59:11 +02:00
0xboobface 367bec664c Sleep 100ms between open and close checks for the preview 2019-06-11 19:58:46 +02:00
0xboobface ddbd8de900 Fix Flirt4Free thumb overviews and recording 2019-06-08 10:34:44 +02:00
0xboobface 3101e1b36d Update login not working section 2019-06-07 21:33:14 +02:00
0xboobface ca17d4758c Increase version to 2.0.1 2019-06-07 21:24:12 +02:00
0xboobface e08d895054 Add login not working section 2019-06-03 21:27:27 +02:00
0xboobface b136fce0db Add menu entry to rerun the post-processing script 
In client/server mode this will trigger the playlist generation and
post-processing. In standalone mode only the post-processing will be
executed.
 2019-06-02 19:53:25 +02:00
0xboobface d5f2f043e4 Fix download filename 2019-06-01 17:26:33 +02:00
0xboobface a41223397d Make use of the Dialogs class instead of creation own alerts 2019-06-01 15:33:20 +02:00
0xboobface 9302dffd7f Set version to 2.0.0 2019-06-01 15:32:47 +02:00
0xboobface 4104b5990c Fix Camsoda JSON parsing 2019-06-01 15:32:19 +02:00
0xboobface f11fcf7ca1 Rewrite recording code for remote recording 2019-06-01 12:12:46 +02:00
0xboobface 0f3d0b6337 Rewrite recording code for local recording 
Remote recording is TBD
 2019-05-31 20:00:07 +02:00
0xboobface 8d3f2da18b Apply stylesheet to all dialogs 2019-05-01 10:49:15 +02:00
0xboobface f8c5470fba Add example script by @electrotek@mastodon.cloud 2019-04-22 17:42:15 +02:00
0xboobface f4b7141a63 Increase version to 1.21.1 2019-04-20 16:03:04 +02:00
0xboobface b854455f8a Increase version to 1.21.0 2019-04-20 14:27:01 +02:00
0xboobface 80071a1eb4 Add Flirt4Free config UI 2019-04-20 12:50:41 +02:00
0xboobface 204eb99b29 Implement follow/unfollow for Flirt4Free 2019-04-16 19:51:57 +02:00
0xboobface f1d11c07b5 Merge branch 'dev' into flirt4free 2019-04-15 16:02:35 +02:00
0xboobface 8eb5f3f33d Set version to 1.20.0 2019-04-14 20:38:32 +02:00
0xboobface 5e8604d38b Merge branch 'dev' into flirt4free 2019-04-14 20:00:53 +02:00
0xboobface 38cacc563c Add hyperlinks 2019-04-14 19:56:09 +02:00
0xboobface 1a33c3d92d Add section how to run several instances 2019-04-14 19:53:16 +02:00
0xboobface c672750d10 Add example script by @uo0Evx99@mastodon.cloud 2019-04-14 19:43:50 +02:00
0xboobface 165e49d8e7 Add the post-processing documentation 2019-04-14 18:12:58 +02:00
0xboobface 9037d8544d Add documentation for the configuration files 2019-04-14 17:57:32 +02:00
0xboobface 74f727bc12 Set insets of buttons to 5 2019-04-13 16:24:24 +02:00
0xboobface ea310e5970 Merge branch 'dev' into flirt4free 2019-04-13 15:25:06 +02:00
0xboobface 280b0a30b7 Set insets of buttons in the top bar to 5 2019-04-13 14:32:05 +02:00
0xboobface a763162963 Add tab to open the help 2019-04-13 14:22:52 +02:00
0xboobface 15bfe0f44f Add basic functionality for Flirt4Free 2019-04-12 21:57:53 +02:00
0xboobface 2635246bef Sort ignore list by model name 2019-04-11 16:22:31 +02:00
0xboobface 348019d8e0 Add warning to max resolution 
Add the warning to the tooltip: Caution: If the resolution is unknown,
ctbrec will not record the stream!
 2019-04-11 15:33:08 +02:00
0xboobface d6482c5558 Enable multi-selection by ctrl and not shift 2019-04-11 15:24:39 +02:00
0xboobface 0ae139e17a Add button/dialog to settings to edit the ignore list 2019-04-11 15:18:46 +02:00
0xboobface 9696edd002 Apply application stylesheets to custom dialogs 2019-04-11 14:38:09 +02:00
0xboobface 62c6f9a885 Remove notes from config, if new note is an empty string 2019-04-11 14:00:27 +02:00
0xboobface 715b312774 Add more documentation 2019-04-09 18:31:30 +02:00
0xboobface f0bf6c5d7c Add index and search to documentation app 2019-04-09 12:06:38 +02:00
0xboobface 482a7289b7 Add missing files 2019-04-08 15:47:18 +02:00
0xboobface adf3da4aee Add documentation server with markdown servlet 2019-04-08 15:41:09 +02:00
0xboobface 601669fdd6 Added menu entry to ignore models 
Ignored models are not displayed in the thumb overview tab. This is
useful, if you don't like a model and want to get rid of it for good
 2019-04-07 18:43:06 +02:00
0xboobface 458e05d2b4 Add notes column to recorded models tab 2019-04-07 18:11:27 +02:00
0xboobface fb7953e045 Add crypto wallets again 2019-04-07 17:20:16 +02:00
0xboobface 9647f1160f Fix: Errors thrown by external browser 
This hopefully fixes the errors, which popped up in the external browser, because
it tried to write to a closed socket.
 2019-04-05 14:50:45 +02:00
0xboobface 25e7c8a0ea Add filter input to filter by model name and url 2019-04-05 13:40:08 +02:00
0xboobface 85b809da00 Clear search box, if escape is pressed 2019-04-05 13:39:41 +02:00
0xboobface 73221ce881 Set version to 1.19.1 2019-04-04 19:00:49 +02:00
0xboobface dd1a2c1cc8 Use the proper URL to retrieve the news toots 2019-04-04 18:55:36 +02:00
0xboobface 055de8b653 Update bundled Java to version 12 2019-04-04 18:40:30 +02:00
0xboobface f5a302337f Don't show previews, if disabled 2019-04-03 21:00:20 +02:00
0xboobface 1dd432dbd9 Add base URL setting for Bongacams 2019-03-05 17:01:42 +01:00
0xboobface 71599c7156 Get the 50 latest toots instead of 20 2019-02-28 18:24:19 +01:00
0xboobface 14b2911651 Increase version to 1.19.0 2019-02-19 18:57:40 +01:00
0xboobface 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
0xboobface fba3a72167 Disable concurrent download settings for server mode 2019-02-13 20:46:43 +01:00
0xboobface 70bb052c94 Improve layout and look of StatusPane 2019-02-13 15:29:43 +01:00
0xboobface 0a58b91fec Don't show replies, but only new status 2019-02-13 12:23:19 +01:00
0xboobface 2b82215678 Use pastebin URLs for the changelog and update check 2019-02-11 15:43:17 +01:00
0xboobface 9245ab6592 Add tooltip for max resolution 2019-02-06 20:53:05 +01:00
0xboobface 351560079b Add concurrent recordings setting to settings tab 2019-02-05 15:25:56 +01:00
0xboobface 097fb251cb Add getCurrentlyRecording to recorder 
This method returns the models, which are currently recorded. It is
implemented as default method, so that LocalRecorder and RemoteRecorder
don't have to implement the same logic.
 2019-02-05 15:07:56 +01:00
0xboobface 76f4583ebc Rename Recorder.isRecording to Recorder.isTracked 2019-02-05 14:45:44 +01:00
0xboobface 198a9c6893 Rename Recorder.getModelsRecording to Recorder.getModels 2019-02-05 14:44:21 +01:00
0xboobface 89f2319345 Add 5min options for split recordings 2019-02-05 12:43:57 +01:00
0xboobface 6ee666a0b1 Add news tab, which shows status updates from mastodon 2019-01-31 16:43:48 +01:00
0xboobface 80e577db7c Add menu entry to regenerate the playlist 2019-01-31 15:07:42 +01:00
0xboobface 2616d318c0 Deactivate validation if control is disabled 2019-01-31 14:16:41 +01:00
0xboobface 6e58dd6be5 Implement follow/unfollow for BongaCams 2019-01-29 16:28:07 +01:00
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 182a9e079e Update active recording counter, when a MODEL_ONLINE event arrives 2019-01-28 13:32:24 +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 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 d346270da2 Show the number of active recordings in the window title 
Use the event system to show the number of active recordings in the
window title. Requested in #155.
 2019-01-24 17:36:23 +01:00
0xboobface 2c67b0b75c Merge branch 'jasmin' into dev 2019-01-24 15:52:38 +01:00
0xboobface 6fcdce673d Show error message on Followed tab, if credentials are missing 2019-01-24 15:52:25 +01:00
0xboobface 86416e0402 Add config UI for FC2Live 2019-01-24 15:38:35 +01:00
0xboobface beeaca4beb Implement login and follow/unfollow 2019-01-24 15:24:05 +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 b548db4a66 Adjust CamsodaUpdateService to new JSON structure 2019-01-23 17:40:20 +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 a69b0926f0 Remove NotLoggedInException 
This exception is not used anymore
 2019-01-23 16:23:07 +01:00
0xboobface 0e9ae32161 Merge branch 'master' into dev 2019-01-23 14:24:34 +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 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 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 e2d3ef264e Add proxy support for the external browser 2019-01-19 15:31:13 +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 ceb65f0ff2 Logging 2019-01-17 12:20:29 +01:00
0xboobface dd2b8041d7 Add some text to explain, that LiveJasmin is not fully functional 2019-01-15 17:10:56 +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 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 f2ac9e3657 Show error dialog if login fails 2019-01-09 15:12:21 +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 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 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 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 0c35f4c219 Merge branch 'dev' into fc2 2018-12-17 23:01:21 +01:00