Skip to content
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

Fix issues using DummyGameLocator with libraries #175

Merged
merged 4 commits into from
Jul 1, 2024
Merged

Fix issues using DummyGameLocator with libraries #175

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dca2001
Fix `DummyGameLocator#gameLibraries()` returning a closed `Stream`
colinmcdonald22 Jun 30, 2024
c4da418
Remove unused import
colinmcdonald22 Jun 30, 2024
34b5747
Fix formatting
colinmcdonald22 Jun 30, 2024
c67df3a
fix: endsWith check
colinmcdonald22 Jun 30, 2024
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: 11 additions & 2 deletions launcher/src/main/java/space/vectrix/ignite/game/DummyGameLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.jetbrains.annotations.NotNull;
import org.tinylog.Logger;
Expand Down Expand Up @@ -84,13 +86,20 @@ public void apply(final @NotNull IgniteBootstrap bootstrap) throws Throwable {
@Override
public @NotNull Stream<Path> gameLibraries() {
final Path libraryPath = Blackboard.raw(Blackboard.GAME_LIBRARIES);
final List<Path> libraries;

try(final Stream<Path> stream = Files.walk(libraryPath)) {
return stream
// We must .collect() to a list and re-stream() as Stream is AutoClosable, and thus
// will be closed as soon as we exit the try-catch block.
libraries = stream
.filter(Files::isRegularFile)
.filter(path -> path.getFileName().endsWith(".jar"));
.filter(path -> path.toString().endsWith(".jar"))
.collect(Collectors.toList());
} catch(final Throwable throwable) {
return Stream.empty();
}

return libraries.stream();
}

@Override
Expand Down
Loading