j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Added setting to record all followed models

This commit is contained in:
0xboobface 2018-08-13 18:29:44 +02:00
parent e00c653c23
commit 94bede6367
2 changed files with 190 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/main/java/ctbrec/recorder/LocalRecorder.java
View File

@ -1,4 +1,5 @@
package ctbrec.recorder; package ctbrec.recorder;
import static ctbrec.Recording.STATUS.FINISHED; import static ctbrec.Recording.STATUS.FINISHED;
import static ctbrec.Recording.STATUS.GENERATING_PLAYLIST; import static ctbrec.Recording.STATUS.GENERATING_PLAYLIST;
import static ctbrec.Recording.STATUS.RECORDING; import static ctbrec.Recording.STATUS.RECORDING;
@ -18,8 +19,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -30,24 +29,28 @@ import com.iheartradio.m3u8.PlaylistException;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.HttpClient; import ctbrec.HttpClient;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.ModelParser;
import ctbrec.Recording; import ctbrec.Recording;
import ctbrec.Recording.STATUS; import ctbrec.Recording.STATUS;
import ctbrec.recorder.PlaylistGenerator.InvalidPlaylistException; import ctbrec.recorder.PlaylistGenerator.InvalidPlaylistException;
import ctbrec.recorder.download.Download; import ctbrec.recorder.download.Download;
import ctbrec.recorder.download.HlsDownload; import ctbrec.recorder.download.HlsDownload;
import okhttp3.Request;
import okhttp3.Response;
public class LocalRecorder implements Recorder { public class LocalRecorder implements Recorder {
private static final transient Logger LOG = LoggerFactory.getLogger(LocalRecorder.class); private static final transient Logger LOG = LoggerFactory.getLogger(LocalRecorder.class);
private List<Model> followedModels = Collections.synchronizedList(new ArrayList<>());
private List<Model> models = Collections.synchronizedList(new ArrayList<>()); private List<Model> models = Collections.synchronizedList(new ArrayList<>());
private Lock lock = new ReentrantLock();
private Map<Model, Download> recordingProcesses = Collections.synchronizedMap(new HashMap<>()); private Map<Model, Download> recordingProcesses = Collections.synchronizedMap(new HashMap<>());
private Map<File, PlaylistGenerator> playlistGenerators = new HashMap<>(); private Map<File, PlaylistGenerator> playlistGenerators = new HashMap<>();
private Map<File, SegmentMerger> segmentMergers = new HashMap<>(); private Map<File, SegmentMerger> segmentMergers = new HashMap<>();
private Config config; private Config config;
private ProcessMonitor processMonitor; private ProcessMonitor processMonitor;
private OnlineMonitor onlineMonitor; private OnlineMonitor onlineMonitor;
private FollowedMonitor followedMonitor;
private PlaylistGeneratorTrigger playlistGenTrigger; private PlaylistGeneratorTrigger playlistGenTrigger;
private HttpClient client = HttpClient.getInstance(); private HttpClient client = HttpClient.getInstance();
private volatile boolean recording = true; private volatile boolean recording = true;
@ -68,6 +71,11 @@ public class LocalRecorder implements Recorder {
playlistGenTrigger = new PlaylistGeneratorTrigger(); playlistGenTrigger = new PlaylistGeneratorTrigger();
playlistGenTrigger.start(); playlistGenTrigger.start();
if (config.getSettings().recordFollowed) {
followedMonitor = new FollowedMonitor();
followedMonitor.start();
}
LOG.debug("Recorder initialized"); LOG.debug("Recorder initialized");
LOG.info("Models to record: {}", models); LOG.info("Models to record: {}", models);
LOG.info("Saving recordings in {}", config.getSettings().recordingsDir); LOG.info("Saving recordings in {}", config.getSettings().recordingsDir);
@ -75,31 +83,28 @@ public class LocalRecorder implements Recorder {
@Override @Override
public void startRecording(Model model) { public void startRecording(Model model) {
lock.lock();
if (!models.contains(model)) { if (!models.contains(model)) {
LOG.info("Model {} added", model); LOG.info("Model {} added", model);
if (followedModels.contains(model)) {
followedModels.remove(model);
}
models.add(model); models.add(model);
config.getSettings().models.add(model); config.getSettings().models.add(model);
onlineMonitor.interrupt(); onlineMonitor.interrupt();
} }
lock.unlock();
} }
@Override @Override
public void stopRecording(Model model) throws IOException { public void stopRecording(Model model) throws IOException {
lock.lock(); if (models.contains(model) || followedModels.contains(model)) {
try {
if (models.contains(model)) {
models.remove(model); models.remove(model);
followedModels.remove(model);
config.getSettings().models.remove(model); config.getSettings().models.remove(model);
if (recordingProcesses.containsKey(model)) { if (recordingProcesses.containsKey(model)) {
stopRecordingProcess(model); stopRecordingProcess(model);
} }
LOG.info("Model {} removed", model); LOG.info("Model {} removed", model);
} }
} finally {
lock.unlock();
}
} }
private void startRecordingProcess(Model model) throws IOException { private void startRecordingProcess(Model model) throws IOException {
@ -109,7 +114,7 @@ public class LocalRecorder implements Recorder {
return; return;
} }
if (!models.contains(model)) { if (!models.contains(model) && !followedModels.contains(model)) {
LOG.info("Model {} has been removed. Restarting of recording cancelled.", model); LOG.info("Model {} has been removed. Restarting of recording cancelled.", model);
return; return;
} }
@ -129,29 +134,22 @@ public class LocalRecorder implements Recorder {
} }
private void stopRecordingProcess(Model model) throws IOException { private void stopRecordingProcess(Model model) throws IOException {
lock.lock();
try {
Download download = recordingProcesses.get(model); Download download = recordingProcesses.get(model);
download.stop(); download.stop();
recordingProcesses.remove(model); recordingProcesses.remove(model);
} finally {
lock.unlock();
}
} }
@Override @Override
public boolean isRecording(Model model) { public boolean isRecording(Model model) {
lock.lock(); return models.contains(model) || followedModels.contains(model);
try {
return models.contains(model);
} finally {
lock.unlock();
}
} }
@Override @Override
public List<Model> getModelsRecording() { public List<Model> getModelsRecording() {
return Collections.unmodifiableList(models); List<Model> union = new ArrayList<>();
union.addAll(models);
union.addAll(followedModels);
return Collections.unmodifiableList(union);
} }
@Override @Override
@ -162,13 +160,14 @@ public class LocalRecorder implements Recorder {
onlineMonitor.running = false; onlineMonitor.running = false;
processMonitor.running = false; processMonitor.running = false;
playlistGenTrigger.running = false; playlistGenTrigger.running = false;
if (followedMonitor != null) {
followedMonitor.running = false;
}
LOG.debug("Stopping all recording processes"); LOG.debug("Stopping all recording processes");
stopRecordingProcesses(); stopRecordingProcesses();
} }
private void stopRecordingProcesses() { private void stopRecordingProcesses() {
lock.lock();
try {
for (Model model : models) { for (Model model : models) {
Download recordingProcess = recordingProcesses.get(model); Download recordingProcess = recordingProcesses.get(model);
if (recordingProcess != null) { if (recordingProcess != null) {
@ -180,9 +179,6 @@ public class LocalRecorder implements Recorder {
} }
} }
} }
} finally {
lock.unlock();
}
} }
private boolean checkIfOnline(Model model) throws IOException { private boolean checkIfOnline(Model model) throws IOException {
@ -199,7 +195,7 @@ public class LocalRecorder implements Recorder {
} }
try { try {
boolean modelInRecordingList = models.contains(model); boolean modelInRecordingList = isRecording(model);
boolean online = checkIfOnline(model); boolean online = checkIfOnline(model);
if (modelInRecordingList && online) { if (modelInRecordingList && online) {
LOG.info("Restarting recording for model {}", model); LOG.info("Restarting recording for model {}", model);
@ -223,8 +219,6 @@ public class LocalRecorder implements Recorder {
public void run() { public void run() {
running = true; running = true;
while (running) { while (running) {
lock.lock();
try {
List<Model> restart = new ArrayList<Model>(); List<Model> restart = new ArrayList<Model>();
for (Iterator<Entry<Model, Download>> iterator = recordingProcesses.entrySet().iterator(); iterator.hasNext();) { for (Iterator<Entry<Model, Download>> iterator = recordingProcesses.entrySet().iterator(); iterator.hasNext();) {
Entry<Model, Download> entry = iterator.next(); Entry<Model, Download> entry = iterator.next();
@ -240,13 +234,58 @@ public class LocalRecorder implements Recorder {
for (Model m : restart) { for (Model m : restart) {
tryRestartRecording(m); tryRestartRecording(m);
} }
try {
if (running)
Thread.sleep(1000);
} catch (InterruptedException e) {
LOG.error("Couldn't sleep", e);
} }
finally { }
lock.unlock(); LOG.debug(getName() + " terminated");
}
}
private class FollowedMonitor extends Thread {
private volatile boolean running = false;
public FollowedMonitor() {
setName("FollowedMonitor");
setDaemon(true);
}
@Override
public void run() {
running = true;
while (running) {
try {
String url = "https://chaturbate.com/followed-cams/?page=1&keywords=&_=" + System.currentTimeMillis();
LOG.debug("Fetching page {}", url);
Request request = new Request.Builder().url(url).build();
Response response = client.execute(request, true);
if (response.isSuccessful()) {
List<Model> followed = ModelParser.parseModels(response.body().string());
response.close();
followedModels.clear();
for (Model model : followed) {
if (!followedModels.contains(model) && !models.contains(model)) {
LOG.info("Model {} added", model);
followedModels.add(model);
}
}
onlineMonitor.interrupt();
} else {
int code = response.code();
response.close();
LOG.error("Couldn't retrieve followed models. HTTP status {}", code);
}
} catch (IOException e) {
LOG.error("Couldn't retrieve followed models.", e);
} }
try { try {
if(running) Thread.sleep(1000); if (running)
Thread.sleep(10000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOG.error("Couldn't sleep", e); LOG.error("Couldn't sleep", e);
} }
@ -272,7 +311,6 @@ public class LocalRecorder implements Recorder {
t.start(); t.start();
} }
private File merge(File recDir) { private File merge(File recDir) {
SegmentMerger segmentMerger = new SegmentMerger(); SegmentMerger segmentMerger = new SegmentMerger();
segmentMergers.put(recDir, segmentMerger); segmentMergers.put(recDir, segmentMerger);
@ -351,29 +389,25 @@ public class LocalRecorder implements Recorder {
public void run() { public void run() {
running = true; running = true;
while (running) { while (running) {
lock.lock(); for (Model model : getModelsRecording()) {
try { try {
for (Model model : models) {
if (!recordingProcesses.containsKey(model)) { if (!recordingProcesses.containsKey(model)) {
try {
boolean isOnline = checkIfOnline(model); boolean isOnline = checkIfOnline(model);
LOG.trace("Checking online state for {}: {}", model, (isOnline ? "online" : "offline")); LOG.trace("Checking online state for {}: {}", model, (isOnline ? "online" : "offline"));
if (isOnline) { if (isOnline) {
LOG.info("Model {}'s room back to public. Starting recording", model); LOG.info("Model {}'s room back to public. Starting recording", model);
startRecordingProcess(model); startRecordingProcess(model);
} }
}
} catch (Exception e) { } catch (Exception e) {
LOG.error("Couldn't check if model {} is online", model.getName(), e); LOG.error("Couldn't check if model {} is online", model.getName(), e);
model.setOnline(false); model.setOnline(false);
} }
} }
}
} finally {
lock.unlock();
}
try { try {
if(running) Thread.sleep(10000); if (running)
Thread.sleep(10000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOG.trace("Sleep interrupted"); LOG.trace("Sleep interrupted");
} }
@ -416,7 +450,8 @@ public class LocalRecorder implements Recorder {
} }
} }
if(running) Thread.sleep(10000); if (running)
Thread.sleep(10000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOG.error("Couldn't sleep", e); LOG.error("Couldn't sleep", e);
} catch (Exception e) { } catch (Exception e) {

47
src/main/java/ctbrec/ui/SettingsTab.java
View File

@ -42,6 +42,7 @@ public class SettingsTab extends Tab {
private static final transient Logger LOG = LoggerFactory.getLogger(SettingsTab.class); private static final transient Logger LOG = LoggerFactory.getLogger(SettingsTab.class);
private TextField recordingsDirectory; private TextField recordingsDirectory;
private Button recordingsDirectoryButton;
private TextField mergeDirectory; private TextField mergeDirectory;
private TextField mediaPlayer; private TextField mediaPlayer;
private TextField username; private TextField username;
@ -53,10 +54,13 @@ public class SettingsTab extends Tab {
private CheckBox automerge = new CheckBox(); private CheckBox automerge = new CheckBox();
private CheckBox automergeKeepSegments = new CheckBox(); private CheckBox automergeKeepSegments = new CheckBox();
private CheckBox chooseStreamQuality = new CheckBox(); private CheckBox chooseStreamQuality = new CheckBox();
private CheckBox autoRecordFollowed = new CheckBox();
private PasswordField password; private PasswordField password;
private RadioButton recordLocal; private RadioButton recordLocal;
private RadioButton recordRemote; private RadioButton recordRemote;
private ToggleGroup recordLocation; private ToggleGroup recordLocation;
private TitledPane ctb;
private TitledPane mergePane; private TitledPane mergePane;
public SettingsTab() { public SettingsTab() {
@ -81,7 +85,8 @@ public class SettingsTab extends Tab {
GridPane.setHgrow(recordingsDirectory, Priority.ALWAYS); GridPane.setHgrow(recordingsDirectory, Priority.ALWAYS);
GridPane.setColumnSpan(recordingsDirectory, 2); GridPane.setColumnSpan(recordingsDirectory, 2);
layout.add(recordingsDirectory, 1, 0); layout.add(recordingsDirectory, 1, 0);
layout.add(createRecordingsBrowseButton(), 3, 0); recordingsDirectoryButton = createRecordingsBrowseButton();
layout.add(recordingsDirectoryButton, 3, 0);
layout.add(new Label("Player"), 0, 1); layout.add(new Label("Player"), 0, 1);
mediaPlayer = new TextField(Config.getInstance().getSettings().mediaPlayer); mediaPlayer = new TextField(Config.getInstance().getSettings().mediaPlayer);
@ -116,12 +121,29 @@ public class SettingsTab extends Tab {
GridPane.setHgrow(password, Priority.ALWAYS); GridPane.setHgrow(password, Priority.ALWAYS);
GridPane.setColumnSpan(password, 2); GridPane.setColumnSpan(password, 2);
layout.add(password, 1, 1); layout.add(password, 1, 1);
TitledPane ctb = new TitledPane("Chaturbate", layout);
Label l = new Label("Record all followed models");
layout.add(l, 0, 2);
autoRecordFollowed = new CheckBox();
autoRecordFollowed.setSelected(Config.getInstance().getSettings().recordFollowed);
autoRecordFollowed.setOnAction((e) -> {
Config.getInstance().getSettings().recordFollowed = autoRecordFollowed.isSelected();
showRestartRequired();
});
GridPane.setMargin(autoRecordFollowed, new Insets(0, 0, 0, CHECKBOX_MARGIN));
GridPane.setMargin(username, new Insets(0, 0, 0, CHECKBOX_MARGIN));
GridPane.setMargin(password, new Insets(0, 0, 0, CHECKBOX_MARGIN));
layout.add(autoRecordFollowed, 1, 2);
Label warning = new Label("Don't do this, if you follow many models. You have been warned ;) !");
warning.setTextFill(Color.RED);
layout.add(warning, 2, 2);
ctb = new TitledPane("Chaturbate", layout);
ctb.setCollapsible(false); ctb.setCollapsible(false);
mainLayout.add(ctb, 0, 1); mainLayout.add(ctb, 0, 1);
layout = createGridLayout(); layout = createGridLayout();
Label l = new Label("Display stream resolution in overview"); l = new Label("Display stream resolution in overview");
layout.add(l, 0, 0); layout.add(l, 0, 0);
loadResolution = new CheckBox(); loadResolution = new CheckBox();
loadResolution.setSelected(Config.getInstance().getSettings().determineResolution); loadResolution.setSelected(Config.getInstance().getSettings().determineResolution);
@ -192,11 +214,7 @@ public class SettingsTab extends Tab {
recordLocation.selectedToggleProperty().addListener((e) -> { recordLocation.selectedToggleProperty().addListener((e) -> {
Config.getInstance().getSettings().localRecording = recordLocal.isSelected(); Config.getInstance().getSettings().localRecording = recordLocal.isSelected();
setRecordingMode(recordLocal.isSelected()); setRecordingMode(recordLocal.isSelected());
Alert restart = new AutosizeAlert(AlertType.INFORMATION); showRestartRequired();
restart.setTitle("Restart required");
restart.setHeaderText("Restart required");
restart.setContentText("Changes get applied after a restart of the application");
restart.show();
}); });
GridPane.setMargin(l, new Insets(0, 0, CHECKBOX_MARGIN, 0)); GridPane.setMargin(l, new Insets(0, 0, CHECKBOX_MARGIN, 0));
GridPane.setMargin(recordLocal, new Insets(0, 0, CHECKBOX_MARGIN, 0)); GridPane.setMargin(recordLocal, new Insets(0, 0, CHECKBOX_MARGIN, 0));
@ -267,6 +285,14 @@ public class SettingsTab extends Tab {
setRecordingMode(recordLocal.isSelected()); setRecordingMode(recordLocal.isSelected());
} }
private void showRestartRequired() {
Alert restart = new AutosizeAlert(AlertType.INFORMATION);
restart.setTitle("Restart required");
restart.setHeaderText("Restart required");
restart.setContentText("Changes get applied after a restart of the application");
restart.show();
}
private GridPane createGridLayout() { private GridPane createGridLayout() {
GridPane layout = new GridPane(); GridPane layout = new GridPane();
layout.setPadding(new Insets(10)); layout.setPadding(new Insets(10));
@ -282,6 +308,9 @@ public class SettingsTab extends Tab {
automerge.setDisable(!local); automerge.setDisable(!local);
automergeKeepSegments.setDisable(!local); automergeKeepSegments.setDisable(!local);
mergePane.setDisable(!local); mergePane.setDisable(!local);
ctb.setDisable(!local);
recordingsDirectory.setDisable(!local);
recordingsDirectoryButton.setDisable(!local);
} }
private ChangeListener<? super Boolean> createRecordingsDirectoryFocusListener() { private ChangeListener<? super Boolean> createRecordingsDirectoryFocusListener() {
@ -355,7 +384,7 @@ public class SettingsTab extends Tab {
return null; return null;
} }
private Node createRecordingsBrowseButton() { private Button createRecordingsBrowseButton() {
Button button = new Button("Select"); Button button = new Button("Select");
button.setOnAction((e) -> { button.setOnAction((e) -> {
DirectoryChooser chooser = new DirectoryChooser(); DirectoryChooser chooser = new DirectoryChooser();