Skip to content

Extend setup syntax #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tosox merged 1 commit into from
May 2, 2026
Merged

Extend setup syntax #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions src/main/java/de/tosox/zonerelay/infrastructure/install/ModEntryInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,11 @@ public void install(ModEntry entry, File archive, ProgressListener progressListe

for (int i = 0; i < total; i++) {
String instruction = setup.get(i);
Path source = tempDir.resolve(instruction);
Path destination = targetDir.resolve(source.getFileName());
SetupMapping mapping = resolveMapping(instruction, tempDir, targetDir);

uiLogger.info(localizer.translate("MSG_COPY_TO", instruction, source.getFileName()));
fileLogger.info("Copying %s → %s", source, destination);
FileUtils.copyDirectory(source.toFile(), destination.toFile());
uiLogger.info(localizer.translate("MSG_COPY_TO", mapping.source().getFileName(), mapping.destination()));
fileLogger.info("Copying %s → %s", mapping.source(), mapping.destination());
copyEntry(mapping.source(), mapping.destination());

progressListener.onProgressUpdate(i + 1, total);
}
Expand All @@ -103,4 +102,36 @@ public void install(ModEntry entry, File archive, ProgressListener progressListe
}
progressListener.onProgressUpdate(1, 1);
}

private SetupMapping resolveMapping(String instruction, Path tempDir, Path targetDir) {
if (instruction.contains("->")) {
String[] parts = instruction.split("->", 2);
Path source = tempDir.resolve(parts[0].trim());
String dstPart = parts[1].trim();
Path dstBase = targetDir.resolve(dstPart);

Path destination;
if (Files.isDirectory(source) || !FilenameUtils.getExtension(dstPart).isEmpty()) {
destination = dstBase;
} else {
destination = dstBase.resolve(source.getFileName());
}

return new SetupMapping(source, destination);
}

Path source = tempDir.resolve(instruction);
return new SetupMapping(source, targetDir.resolve(source.getFileName()));
}

private void copyEntry(Path source, Path destination) throws Exception {
if (Files.isDirectory(source)) {
FileUtils.copyDirectory(source.toFile(), destination.toFile());
} else {
Files.createDirectories(destination.getParent());
FileUtils.copyFile(source.toFile(), destination.toFile());
}
}

private record SetupMapping(Path source, Path destination) {}
}
Loading