Skip to content

Fix cross-platform file sorting differences #385

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
WaitingIdly wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −2
Open

Fix cross-platform file sorting differences #385

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
3 changes: 1 addition & 2 deletions src/main/java/com/cleanroommc/groovyscript/sandbox/SandboxData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ public static String getRelativePath(String path) {

static Collection<File> getSortedFilesOf(File root, Collection<String> paths, boolean debug) {
Object2IntLinkedOpenHashMap<File> files = new Object2IntLinkedOpenHashMap<>();
String separator = File.separatorChar == '\\' ? "\\\\" : File.separator;

for (String path : paths) {
File rootFile = new File(root, path);
Expand All @@ -155,7 +154,7 @@ static Collection<File> getSortedFilesOf(File root, Collection<String> paths, bo
}
// if we are looking at a specific file, we don't want that to be overridden.
// otherwise, we want to use the specificity based on the number of file separators.
int pathSize = StringUtils.countMatches(path, separator);
int pathSize = StringUtils.countMatches(rootFile.getPath(), File.separatorChar);
try (Stream<Path> stream = Files.walk(rootFile.toPath(), debug ? FOLLOW_LINKS : NO_VISIT_OPTIONS)) {
stream.filter(path1 -> isGroovyFile(path1.toString()))
.map(Path::toFile)
Expand Down