BlocksMod/SpecialSource
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add -q option to suppress verbose output

Browse Source
This commit is contained in:
Agaricus 2013-01-21 20:21:33 -08:00
parent ce4b890f87
commit b20840a65e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/md_5/specialsource/JarMapping.java
View File

@ -90,7 +90,6 @@ public class JarMapping {
if (logfile == null) { if (logfile == null) {
out = new PrintWriter(System.out); out = new PrintWriter(System.out);
} else { } else {
System.out.println("Writing mapping file");
out = new PrintWriter(logfile); out = new PrintWriter(logfile);
} }

17
src/main/java/net/md_5/specialsource/SpecialSource.java
View File

@ -39,6 +39,7 @@ import org.objectweb.asm.ClassReader;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class SpecialSource { public class SpecialSource {
private static OptionSet options;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
OptionParser parser = new OptionParser() { OptionParser parser = new OptionParser() {
@ -64,11 +65,11 @@ public class SpecialSource {
acceptsAll(asList("o", "out-jar"), "Output jar to write") acceptsAll(asList("o", "out-jar"), "Output jar to write")
.withRequiredArg() .withRequiredArg()
.ofType(File.class); .ofType(File.class);
acceptsAll(asList("q", "quiet"), "Quiet mode");
} }
}; };
OptionSet options = null;
try { try {
options = parser.parse(args); options = parser.parse(args);
} catch (OptionException ex) { } catch (OptionException ex) {
@ -94,11 +95,11 @@ public class SpecialSource {
return; return;
}*/ }*/
System.out.println("Reading jars"); log("Reading jars");
Jar jar1 = Jar.init((File)options.valueOf("first-jar")); Jar jar1 = Jar.init((File)options.valueOf("first-jar"));
Jar jar2 = Jar.init((File)options.valueOf("second-jar")); Jar jar2 = Jar.init((File)options.valueOf("second-jar"));
System.out.println("Creating jar compare"); log("Creating jar compare");
JarComparer visitor1 = new JarComparer(jar1); JarComparer visitor1 = new JarComparer(jar1);
JarComparer visitor2 = new JarComparer(jar2); JarComparer visitor2 = new JarComparer(jar2);
visit(new Pair<Jar>(jar1, jar2), new Pair<JarComparer>(visitor1, visitor2), new Pair<String>(jar1.main, jar2.main)); visit(new Pair<Jar>(jar1, jar2), new Pair<JarComparer>(visitor1, visitor2), new Pair<String>(jar1.main, jar2.main));
@ -106,12 +107,18 @@ public class SpecialSource {
JarMapping jarMapping = new JarMapping(visitor1, visitor2, (File)options.valueOf("srg-out")); JarMapping jarMapping = new JarMapping(visitor1, visitor2, (File)options.valueOf("srg-out"));
if (options.has("in-jar")) { if (options.has("in-jar")) {
System.out.println("Remapping final jar"); log("Remapping final jar");
Jar jar3 = Jar.init((File)options.valueOf("remap-jar")); Jar jar3 = Jar.init((File)options.valueOf("remap-jar"));
JarRemapper.renameJar(jar3, (File)options.valueOf("out-jar"), jarMapping); JarRemapper.renameJar(jar3, (File)options.valueOf("out-jar"), jarMapping);
} }
} }
private static void log(String message) {
if (!options.has("q")) {
System.out.println(message);
}
}
private static void visit(Pair<Jar> jars, Pair<JarComparer> visitors, Pair<String> classes) throws IOException { private static void visit(Pair<Jar> jars, Pair<JarComparer> visitors, Pair<String> classes) throws IOException {
JarComparer visitor1 = visitors.first; JarComparer visitor1 = visitors.first;
JarComparer visitor2 = visitors.second; JarComparer visitor2 = visitors.second;