From 0809cffbade803caa34ad99f5409997f50d57b8b Mon Sep 17 00:00:00 2001 From: Thiakil Date: Tue, 10 Jul 2018 21:18:54 +0800 Subject: buffer the ParsedJar class entry inputstream, allow use with a jarinputstream --- .../java/cuchaz/enigma/analysis/ParsedJar.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/cuchaz/enigma/analysis/ParsedJar.java b/src/main/java/cuchaz/enigma/analysis/ParsedJar.java index fae58f8..55f2141 100644 --- a/src/main/java/cuchaz/enigma/analysis/ParsedJar.java +++ b/src/main/java/cuchaz/enigma/analysis/ParsedJar.java @@ -15,12 +15,14 @@ import cuchaz.enigma.mapping.entry.ClassEntry; import org.objectweb.asm.ClassReader; import org.objectweb.asm.tree.ClassNode; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.function.Consumer; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import java.util.jar.JarInputStream; public class ParsedJar { private final Map nodes = new LinkedHashMap<>(); @@ -33,7 +35,7 @@ public class ParsedJar { JarEntry entry = entries.nextElement(); // is this a class file? if (entry.getName().endsWith(".class")) { - try (InputStream input = jar.getInputStream(entry)) { + try (InputStream input = new BufferedInputStream(jar.getInputStream(entry))) { // read the ClassNode from the jar ClassReader reader = new ClassReader(input); ClassNode node = new ClassNode(); @@ -48,6 +50,27 @@ public class ParsedJar { } } + public ParsedJar(JarInputStream jar) throws IOException { + try { + // get the jar entries that correspond to classes + JarEntry entry; + while ((entry = jar.getNextJarEntry()) != null) { + // is this a class file? + if (entry.getName().endsWith(".class")) { + // read the ClassNode from the jar + ClassReader reader = new ClassReader(jar); + ClassNode node = new ClassNode(); + reader.accept(node, 0); + String path = entry.getName().substring(0, entry.getName().length() - ".class".length()); + nodes.put(path, node); + jar.closeEntry(); + } + } + } finally { + jar.close(); + } + } + public void visit(Consumer visitor) { for (ClassNode node : nodes.values()) { visitor.accept(node); -- cgit v1.2.3