Add infrastructure / implementation of basic progress meters
This commit is contained in:
parent
5fe8dbf4d9
commit
a5ebbbfa37
@ -275,6 +275,8 @@ public class JarMapping {
|
||||
lines.add(line);
|
||||
}
|
||||
|
||||
ProgressMeter meter = new ProgressMeter(lines.size() * 2, "Loading mappings... %2.0f%%");
|
||||
|
||||
//Gather class mappings here so that we can support reversing csrg/tsrg.
|
||||
final Map<String, String> clsMap = new HashMap<>();
|
||||
for (String l : lines) {
|
||||
@ -291,6 +293,7 @@ public class JarMapping {
|
||||
String[] tokens = l.split(" ");
|
||||
clsMap.put(tokens[0], tokens[1]);
|
||||
}
|
||||
meter.makeProgress();
|
||||
}
|
||||
|
||||
// We use a Remapper so that we don't have to duplicate the logic of remapping method descriptors.
|
||||
@ -309,6 +312,7 @@ public class JarMapping {
|
||||
// better 'compact' srg format
|
||||
parseCsrgLine(l, inputTransformer, outputTransformer, reverse, reverseMapper);
|
||||
}
|
||||
meter.makeProgress();
|
||||
}
|
||||
|
||||
currentClass = null;
|
||||
|
@ -174,8 +174,10 @@ public class JarRemapper extends CustomRemapper {
|
||||
}
|
||||
ClassRepo repo = new JarRepo(jar);
|
||||
try (JarOutputStream out = new JarOutputStream(new FileOutputStream(target))) {
|
||||
for (String name : jar.getEntryNames()) {
|
||||
Set<String> jarEntries = jar.getEntryNames();
|
||||
ProgressMeter meter = new ProgressMeter(jarEntries.size(), "Remapping jar... %2.0f%%");
|
||||
|
||||
for (String name : jarEntries) {
|
||||
JarEntry entry;
|
||||
|
||||
try (InputStream is = jar.getResource(name)) {
|
||||
@ -209,6 +211,8 @@ public class JarRemapper extends CustomRemapper {
|
||||
}
|
||||
out.putNextEntry(entry);
|
||||
out.write(data);
|
||||
|
||||
meter.makeProgress();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
65
src/main/java/net/md_5/specialsource/ProgressMeter.java
Normal file
65
src/main/java/net/md_5/specialsource/ProgressMeter.java
Normal file
@ -0,0 +1,65 @@
|
||||
/**
|
||||
* Copyright (c) 2012, md_5. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* The name of the author may not be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.md_5.specialsource;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProgressMeter {
|
||||
|
||||
private int progress;
|
||||
private int lastPrint = -1;
|
||||
private final int total;
|
||||
private final String progressFormat;
|
||||
//
|
||||
public static double printInterval;
|
||||
|
||||
public void makeProgress() {
|
||||
if (!SpecialSource.verbose()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.progress++;
|
||||
|
||||
double percent = ((double) progress / (double) total) * 100.0;
|
||||
int currentInterval = (int) (Math.floor(percent / printInterval));
|
||||
|
||||
if (lastPrint < 0 || currentInterval > lastPrint) {
|
||||
System.out.println(String.format(progressFormat, percent));
|
||||
lastPrint = currentInterval;
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
ProgressMeter meter = new ProgressMeter(1000, "Loading %2.0f%%");
|
||||
for (int i = 0; i < 1000; i++) {
|
||||
meter.makeProgress();
|
||||
}
|
||||
}
|
||||
}
|
@ -116,6 +116,10 @@ public class SpecialSource {
|
||||
//acceptsAll(asList("G", "remap-reflect-field"), "Remap reflection calls to getDeclaredField()"); // TODO
|
||||
|
||||
acceptsAll(asList("q", "quiet"), "Quiet mode");
|
||||
acceptsAll(asList("progress-interval"),"% markers at which to print progress")
|
||||
.withRequiredArg()
|
||||
.ofType(Integer.class)
|
||||
.defaultsTo(10);
|
||||
|
||||
acceptsAll(asList("v", "version"), "Displays version information");
|
||||
|
||||
@ -149,6 +153,9 @@ public class SpecialSource {
|
||||
return;
|
||||
}
|
||||
|
||||
// has default
|
||||
ProgressMeter.printInterval = ((Number) options.valueOf("progress-interval")).doubleValue();
|
||||
|
||||
if (options.has("version"))
|
||||
{
|
||||
System.out.println("SpecialSource v{something}");
|
||||
|
Loading…
Reference in New Issue
Block a user