Print converted size instead of percentage

vimasig · Feb 19, 2021 · cea7522 · cea7522
1 parent 5ecf22c
commit cea7522
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.vimasig</groupId>
     <artifactId>Bozar</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>14</maven.compiler.source>

diff --git a/src/main/java/com/vimasig/bozar/obfuscator/Bozar.java b/src/main/java/com/vimasig/bozar/obfuscator/Bozar.java
@@ -2,6 +2,7 @@
 
 import com.vimasig.bozar.obfuscator.transformer.TransformManager;
 import com.vimasig.bozar.obfuscator.utils.StreamUtils;
+import com.vimasig.bozar.obfuscator.utils.StringUtils;
 import com.vimasig.bozar.obfuscator.utils.model.BozarConfig;
 import com.vimasig.bozar.obfuscator.utils.model.BozarMessage;
 import com.vimasig.bozar.obfuscator.utils.model.CustomClassWriter;
@@ -124,12 +125,9 @@ public void run() {
             log("Done. Took %ss", timeElapsed);
 
             // File size information
-            float rate = (float)output.toFile().length() / (float)input.length();
-            float percentage = rate * 100 - 100;
-            final String percentageStr = new DecimalFormat("##.##").format(Math.abs(percentage));
-            if(percentage == 0) log("File size didn't change.");
-            else if(percentage > 0) log("File size increased by %s%%", percentageStr);
-            else log("File size decreased by %s%%", percentageStr);
+            final String oldSize = StringUtils.getConvertedSize(input.length());
+            final String newSize = StringUtils.getConvertedSize(output.toFile().length());
+            log("File size changed from %s to %s", oldSize, newSize);
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/src/main/java/com/vimasig/bozar/obfuscator/utils/StringUtils.java b/src/main/java/com/vimasig/bozar/obfuscator/utils/StringUtils.java
@@ -1,5 +1,7 @@
 package com.vimasig.bozar.obfuscator.utils;
 
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -12,4 +14,19 @@ public static String getAlphabet() {
                 .map(String::valueOf)
                 .collect(Collectors.joining());
     }
+
+    public static String getConvertedSize(long bytes) {
+        long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
+        if (absB < 1024) {
+            return bytes + " B";
+        }
+        long value = absB;
+        CharacterIterator ci = new StringCharacterIterator("KMGTPE");
+        for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10) {
+            value >>= 10;
+            ci.next();
+        }
+        value *= Long.signum(bytes);
+        return String.format("%.1f %cB", value / 1024.0, ci.current());
+    }
 }