DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split replay folder and file management into their own classes

Browse Source
This commit is contained in:
Jonas Herzig
2021-11-28 14:50:39 +01:00
parent ce5886a427
commit 31817bcf11
12 changed files with 245 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/editor/gui/GuiEditReplay.java
View File

@@ -60,7 +60,7 @@ public class GuiEditReplay extends AbstractGuiPopup<GuiEditReplay> {
super(container);
this.inputPath = inputPath;
try (ReplayFile replayFile = ReplayMod.instance.openReplay(inputPath)) {
try (ReplayFile replayFile = ReplayMod.instance.files.open(inputPath)) {
markers = replayFile.getMarkers().or(HashSet::new);
timeline = new EditTimeline(new HashSet<>(markers), markers -> this.markers = markers);
timeline.setSize(300, 20)
@@ -147,7 +147,7 @@ public class GuiEditReplay extends AbstractGuiPopup<GuiEditReplay> {
ProgressPopup progressPopup = new ProgressPopup(this);
new Thread(() -> {
try (ReplayFile replayFile = ReplayMod.instance.openReplay(inputPath)) {
try (ReplayFile replayFile = ReplayMod.instance.files.open(inputPath)) {
replayFile.writeMarkers(markers);
replayFile.save();
} catch (IOException e) {

10
src/main/java/com/replaymod/editor/gui/MarkerProcessor.java
View File

@@ -49,7 +49,7 @@ public class MarkerProcessor {
public static final String MARKER_NAME_SPLIT = "_RM_SPLIT";
private static boolean hasWork(Path path) throws IOException {
try (ReplayFile inputReplayFile = ReplayMod.instance.openReplay(path)) {
try (ReplayFile inputReplayFile = ReplayMod.instance.files.open(path)) {
return inputReplayFile.getMarkers().or(HashSet::new).stream().anyMatch(m -> m.getName() != null && m.getName().startsWith("_RM_"));
}
}
@@ -113,7 +113,7 @@ public class MarkerProcessor {
ReplayMod mod = ReplayMod.instance;
if (!hasWork(path)) {
ReplayMetaData metaData;
try (ReplayFile inputReplayFile = mod.openReplay(path)) {
try (ReplayFile inputReplayFile = mod.files.open(path)) {
metaData = inputReplayFile.getMetaData();
}
return Collections.singletonList(Pair.of(path, metaData));
@@ -128,7 +128,7 @@ public class MarkerProcessor {
List<Pair<Path, ReplayMetaData>> outputPaths = new ArrayList<>();
Path rawFolder = ReplayMod.instance.getRawReplayFolder();
Path rawFolder = ReplayMod.instance.folders.getRawReplayFolder();
Path inputPath = rawFolder.resolve(path.getFileName());
for (int i = 1; Files.exists(inputPath); i++) {
inputPath = inputPath.resolveSibling(replayName + "." + i + ".mcpr");
@@ -136,7 +136,7 @@ public class MarkerProcessor {
Files.createDirectories(inputPath.getParent());
Files.move(path, inputPath);
try (ReplayFile inputReplayFile = mod.openReplay(inputPath)) {
try (ReplayFile inputReplayFile = mod.files.open(inputPath)) {
List<Marker> markers = inputReplayFile.getMarkers().or(HashSet::new)
.stream().sorted(Comparator.comparing(Marker::getTime)).collect(Collectors.toList());
Iterator<Marker> markerIterator = markers.iterator();
@@ -153,7 +153,7 @@ public class MarkerProcessor {
while (nextPacket != null && outputFileSuffixes.hasNext()) {
Path outputPath = path.resolveSibling(replayName + outputFileSuffixes.next() + ".mcpr");
try (ReplayFile outputReplayFile = mod.openReplay(null, outputPath)) {
try (ReplayFile outputReplayFile = mod.files.open(null, outputPath)) {
long duration = 0;
Set<Marker> outputMarkers = new HashSet<>();
ReplayMetaData metaData = inputReplayFile.getMetaData();