Skip to content

Potentially address subtle bug with file paths getting a trailing slash #161

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
BenjaminAmos merged 2 commits into from
Dec 14, 2025
Merged

Potentially address subtle bug with file paths getting a trailing slash #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
748dcdd
Potentially address subtle bug with file paths getting a trailing slash
Cervator Nov 27, 2025
e309888
Undo a line shortening
Cervator Nov 27, 2025
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
13 changes: 8 additions & 5 deletions ...alt-module/src/main/java/org/terasology/gestalt/module/resources/ClasspathFileSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public Optional<FileReference> getFile(List<String> filepath) {
if (filepath.stream().anyMatch(s -> s.equals(".."))) {
return Optional.empty();
}
String fullpath = buildPathString(filepath);
String fullpath = buildPathString(filepath, false);
if (classLoader.getResource(fullpath) != null) {
return Optional.of(new ClasspathSourceFileReference(fullpath, extractSubpath(basePath, fullpath), classLoader));
} else {
Expand All @@ -112,7 +112,7 @@ public Optional<FileReference> getFile(List<String> filepath) {

@Override
public Collection<FileReference> getFilesInPath(boolean recursive, List<String> path) {
String fullPath = buildPathString(path);
String fullPath = buildPathString(path, true);
Stream<String> candidates = files
.stream()
.filter(file -> file.startsWith(fullPath))
Expand All @@ -129,7 +129,7 @@ public Collection<FileReference> getFilesInPath(boolean recursive, List<String>

@Override
public Set<String> getSubpaths(List<String> path) {
String fullPath = buildPathString(path);
String fullPath = buildPathString(path, true);
return files
.stream()
.filter(file -> file.startsWith(fullPath))
Expand All @@ -141,12 +141,15 @@ public Set<String> getSubpaths(List<String> path) {
.collect(Collectors.toSet());
}

private String buildPathString(List<String> path) {
private String buildPathString(List<String> path, boolean isDirectory) {
String fullPath;
if (path.isEmpty() || (path.size() == 1 && path.get(0).isEmpty())) {
fullPath = basePath;
} else {
fullPath = basePath + CLASS_PATH_JOINER.join(path) + CLASS_PATH_SEPARATOR;
fullPath = basePath + CLASS_PATH_JOINER.join(path);
if (isDirectory) {
fullPath += CLASS_PATH_SEPARATOR;
}
}
return fullPath;
}
Expand Down