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

Fix switching between "record later" and "recording" 

Starting the recording coming from "record later" did not work in every
case (client/server, standalone, start, start paused, record until)
This commit is contained in:
0xb00bface 2021-09-11 14:51:42 +02:00
parent d663ca1160
commit 6e5d706f65
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/ctbrec/ui/action/StartRecordingAction.java
View File

@ -69,6 +69,9 @@ public class StartRecordingAction extends AbstractModelAction {
} }
} }
if (showRecordUntilDialog) {
model.setSuspended(false);
}
new StartRecordingTask(recorder).executeSync(model) new StartRecordingTask(recorder).executeSync(model)
.whenComplete((mdl, ex) -> result.add(new Result(mdl, ex))); .whenComplete((mdl, ex) -> result.add(new Result(mdl, ex)));
} }

1
client/src/main/java/ctbrec/ui/tasks/AbstractModelTask.java
View File

@ -18,6 +18,7 @@ public abstract class AbstractModelTask {
public CompletableFuture<Model> executeSync(Model model) { public CompletableFuture<Model> executeSync(Model model) {
try { try {
org.slf4j.LoggerFactory.getLogger(getClass()).debug("Executing concrete task for {} - suspended:{}", model, model.isSuspended());
concreteTask.accept(model); concreteTask.accept(model);
return CompletableFuture.completedFuture(model); return CompletableFuture.completedFuture(model);
} catch (Exception e) { } catch (Exception e) {

16
common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
View File

@ -265,8 +265,8 @@ public class NextGenLocalRecorder implements Recorder {
@Override @Override
public void addModel(Model model) throws IOException, InvalidKeyException, NoSuchAlgorithmException { public void addModel(Model model) throws IOException, InvalidKeyException, NoSuchAlgorithmException {
Optional<Model> existing = findModel(model); Optional<Model> result = findModel(model);
if (!existing.isPresent()) { if (!result.isPresent()) {
LOG.info("Model {} added", model); LOG.info("Model {} added", model);
recorderLock.lock(); recorderLock.lock();
try { try {
@ -280,9 +280,21 @@ public class NextGenLocalRecorder implements Recorder {
recorderLock.unlock(); recorderLock.unlock();
} }
startRecordingProcess(model); startRecordingProcess(model);
} else {
Model existing = result.get();
copyModelProperties(model, existing);
startRecordingProcess(existing);
} }
} }
private void copyModelProperties(Model src, Model existing) {
existing.setSuspended(src.isSuspended());
existing.setMarkedForLaterRecording(src.isMarkedForLaterRecording());
existing.setPriority(src.getPriority());
existing.setRecordUntil(src.getRecordUntil());
existing.setRecordUntilSubsequentAction(src.getRecordUntilSubsequentAction());
}
private CompletableFuture<Void> startRecordingProcess(Model model) { private CompletableFuture<Void> startRecordingProcess(Model model) {
return CompletableFuture.runAsync(() -> { return CompletableFuture.runAsync(() -> {
try { try {

4
common/src/main/java/ctbrec/recorder/RemoteRecorder.java
View File

@ -98,6 +98,10 @@ public class RemoteRecorder implements Recorder {
@Override @Override
public void addModel(Model model) throws IOException, InvalidKeyException, NoSuchAlgorithmException { public void addModel(Model model) throws IOException, InvalidKeyException, NoSuchAlgorithmException {
LOG.trace("Model marked: {}", model.isMarkedForLaterRecording());
LOG.trace("Model paused: {}", model.isSuspended());
LOG.trace("Model until: {}", model.getRecordUntil().equals(Instant.ofEpochMilli(Model.RECORD_INDEFINITELY)) ? "no limit" : model.getRecordUntil());
LOG.trace("Model after: {}", model.getRecordUntilSubsequentAction());
sendRequest("start", model); sendRequest("start", model);
} }

4
server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
View File

@ -82,6 +82,10 @@ public class RecorderServlet extends AbstractCtbrecServlet {
switch (request.action) { switch (request.action) {
case "start": case "start":
LOG.debug("Starting recording for model {} - {}", request.model.getName(), request.model.getUrl()); LOG.debug("Starting recording for model {} - {}", request.model.getName(), request.model.getUrl());
LOG.trace("Model marked: {}", request.model.isMarkedForLaterRecording());
LOG.trace("Model paused: {}", request.model.isSuspended());
LOG.trace("Model until: {}", request.model.getRecordUntil().equals(Instant.ofEpochMilli(Model.RECORD_INDEFINITELY)) ? "no limit" : request.model.getRecordUntil());
LOG.trace("Model after: {}", request.model.getRecordUntilSubsequentAction());
recorder.addModel(request.model); recorder.addModel(request.model);
String response = "{\"status\": \"success\", \"msg\": \"Recording started\"}"; String response = "{\"status\": \"success\", \"msg\": \"Recording started\"}";
responseWriter.write(response); responseWriter.write(response);