jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix synchronisation problem between client and server 

... for actions pin, unpin and setNote
This commit is contained in:
0xb00bface 2020-08-21 15:20:23 +02:00
parent 217b56b88c
commit d20680f228
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,8 +678,7 @@ public class NextGenLocalRecorder implements Recorder {
@Override
public void setNote(Recording rec, String note) throws IOException {
rec.setNote(note);
recordingManager.saveRecording(rec);
recordingManager.setNote(rec, note);
}
@Override

32
common/src/main/java/ctbrec/recorder/RecordingManager.java
View File

@ -11,6 +11,8 @@ import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.concurrent.locks.ReentrantLock;
import org.slf4j.Logger;
@ -217,8 +219,9 @@ public class RecordingManager {
public void pin(Recording recording) throws IOException {
recordingsLock.lock();
try {
recording.setPinned(true);
saveRecording(recording);
Recording local = getRecording(recording);
local.setPinned(true);
saveRecording(local);
} finally {
recordingsLock.unlock();
}
@ -227,10 +230,31 @@ public class RecordingManager {
public void unpin(Recording recording) throws IOException {
recordingsLock.lock();
try {
recording.setPinned(false);
saveRecording(recording);
Recording local = getRecording(recording);
local.setPinned(false);
saveRecording(local);
} finally {
recordingsLock.unlock();
}
}
public void setNote(Recording rec, String note) throws IOException {
recordingsLock.lock();
try {
Recording local = getRecording(rec);
local.setNote(note);
saveRecording(local);
} finally {
recordingsLock.unlock();
}
}
private Recording getRecording(Recording rec) {
for (Recording r : getAll()) {
if(Objects.equals(r, rec)) {
return r;
}
}
throw new NoSuchElementException("Recording not found");
}
}