Skip to content

support sub folders in lua folder #1155

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

Open
Frotty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support sub folders in lua folder #1155

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
67 changes: 42 additions & 25 deletions de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,32 +781,49 @@ private void injectExternalLuaFiles(File script) {
} catch (FileNotFoundException e) {
throw new RuntimeException("Cannot get build dir", e);
}
if (luaDir.exists()) {
File[] children = luaDir.listFiles();
if (children != null) {
Arrays.stream(children).forEach(child -> {
try {
byte[] bytes = java.nio.file.Files.readAllBytes(child.toPath());
if (child.getName().startsWith("pre_")) {
byte[] existingBytes = java.nio.file.Files.readAllBytes(script.toPath());
java.nio.file.Files.write(
script.toPath(),
bytes);
java.nio.file.Files.write(
script.toPath(),
existingBytes,
StandardOpenOption.APPEND);
} else {
java.nio.file.Files.write(
script.toPath(),
bytes,
StandardOpenOption.APPEND);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
});
if (!luaDir.exists()) {
return;
}

try (var fileStream = java.nio.file.Files.walk(luaDir.toPath())) {
List<Path> luaFiles = fileStream
.filter(java.nio.file.Files::isRegularFile)
.sorted(Comparator.comparing(path -> {
Path relative = luaDir.toPath().relativize(path);
return relative.toString().replace('\\', '/').toLowerCase(Locale.ROOT);
}))
.collect(Collectors.toList());

if (luaFiles.isEmpty()) {
return;
}

List<byte[]> preChunks = new ArrayList<>();
List<byte[]> postChunks = new ArrayList<>();
for (Path luaFile : luaFiles) {
byte[] bytes = java.nio.file.Files.readAllBytes(luaFile);
String fileName = luaFile.getFileName().toString();
if (fileName.startsWith("pre_")) {
preChunks.add(bytes);
} else {
postChunks.add(bytes);
}
}

if (!preChunks.isEmpty()) {
byte[] existingBytes = java.nio.file.Files.readAllBytes(script.toPath());
java.nio.file.Files.write(script.toPath(), new byte[0]);
for (byte[] preChunk : preChunks) {
java.nio.file.Files.write(script.toPath(), preChunk, StandardOpenOption.APPEND);
}
java.nio.file.Files.write(script.toPath(), existingBytes, StandardOpenOption.APPEND);
}

for (byte[] postChunk : postChunks) {
java.nio.file.Files.write(script.toPath(), postChunk, StandardOpenOption.APPEND);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}

Expand Down
Loading