Skip to content

Misc. cleanup #6

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
PaintNinja wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Misc. cleanup #6

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5dcb6e
Keep `parents` tmp variable on the stack, add fast-path for single pa…
PaintNinja Mar 22, 2025
229b6a8
Make `ManifestVerifier` static
PaintNinja Mar 22, 2025
13eed52
More statics
PaintNinja Mar 22, 2025
6a1c335
Auto-close after listing/walking files
PaintNinja Mar 22, 2025
200960d
Reduce memory usage a tiny bit more
PaintNinja Mar 22, 2025
599cc63
Bump ASM
PaintNinja Mar 22, 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
12 changes: 6 additions & 6 deletions src/main/java/cpw/mods/jarhandling/impl/Jar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ private List<Provider> gatherProviders(BiPredicate<String, String> filter) {
if (!Files.exists(services))
return List.of();

try {
return Files.list(services)
try (var servicesDirStream = Files.list(services)) {
Copy link
Member

@LexManos LexManos Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this had issues with Zip file systems, calling close anywhere on them caused the entire thing to shut down.

return servicesDirStream
.filter(Files::isRegularFile)
.map(path -> getProvider(path, filter))
.toList();
Expand Down Expand Up @@ -324,8 +324,8 @@ private Map<String, String> gatherVersionedFiles() {

var ret = new HashMap<String, String>();
var versions = new HashMap<String, Integer>();
try {
Files.walk(versionsDir)
try (var versionsDirStream = Files.walk(versionsDir)) {
versionsDirStream
.filter(Files::isRegularFile)
.map(filesystemRoot::relativize)
.forEach(path -> {
Expand All @@ -344,8 +344,8 @@ private Map<String, String> gatherVersionedFiles() {

private Set<String> gatherPackages() {
var files = new HashSet<String>(this.nameOverrides.keySet());
try {
Files.walk(this.filesystemRoot)
try (var filesStream = Files.walk(this.filesystemRoot)) {
filesStream
.filter(p -> Files.isRegularFile(p) && !"META-INF".equals(p.getName(0).toString()))
.map(p -> this.filesystemRoot.relativize(p).toString().replace('\\', '/'))
.forEach(files::add);
Expand Down