Merge pull request #83 from EpicPlayerA10/chore/stop-execution-on-exc…

…eptions Stop execution on some exceptions
narumii · Aug 29, 2024 · a14e171 · a14e171
2 parents e8951c3 + 5fcfae0
commit a14e171
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/context/DeobfuscatorOptions.java b/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/context/DeobfuscatorOptions.java
@@ -82,13 +82,16 @@ private Builder() {
     public DeobfuscatorOptions.Builder inputJar(@Nullable Path inputJar) {
       this.inputJar = inputJar;
       if (this.inputJar != null) {
-        String fullName = inputJar.getFileName().toString();
-        int dot = fullName.lastIndexOf('.');
+        this.libraries.add(inputJar);
 
         // Auto fill output jar
-        this.outputJar = inputJar.getParent()
-            .resolve(dot == -1 ? fullName + "-out" : fullName.substring(0, dot) + "-out" + fullName.substring(dot));
-        this.libraries.add(inputJar);
+        if (this.outputJar == null) {
+          String fullName = inputJar.getFileName().toString();
+          int dot = fullName.lastIndexOf('.');
+
+          this.outputJar = inputJar.getParent()
+              .resolve(dot == -1 ? fullName + "-out" : fullName.substring(0, dot) + "-out" + fullName.substring(dot));
+        }
       }
       return this;
     }

diff --git a/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/helper/FileHelper.java b/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/helper/FileHelper.java
@@ -1,6 +1,5 @@
 package uwu.narumi.deobfuscator.api.helper;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -26,16 +25,15 @@ public static void loadFilesFromZip(Path path, BiConsumer<String, byte[]> consum
           .forEachRemaining(
               zipEntry -> {
                 try {
-                  consumer.accept(
-                      zipEntry.getName(), zipFile.getInputStream(zipEntry).readAllBytes());
+                  consumer.accept(zipEntry.getName(), zipFile.getInputStream(zipEntry).readAllBytes());
                 } catch (Exception e) {
                   LOGGER.error("Could not load ZipEntry: {}", zipEntry.getName());
                   LOGGER.debug("Error", e);
                 }
               });
     } catch (Exception e) {
       LOGGER.error("Could not load file: {}", path);
-      LOGGER.debug("Error", e);
+      throw new RuntimeException(e);
     }
   }
 

diff --git a/deobfuscator-impl/src/main/java/uwu/narumi/deobfuscator/Deobfuscator.java b/deobfuscator-impl/src/main/java/uwu/narumi/deobfuscator/Deobfuscator.java
@@ -69,16 +69,9 @@ private Deobfuscator(DeobfuscatorOptions options) {
   }
 
   public void start() {
-    try {
-      loadInput();
-      transform(this.options.transformers());
-      saveOutput();
-    } catch (Exception e) {
-      LOGGER.error("Error occurred while obfuscation");
-      LOGGER.debug("Error", e);
-
-      if (this.options.consoleDebug()) e.printStackTrace();
-    }
+    loadInput();
+    transform(this.options.transformers());
+    saveOutput();
   }
 
   public Context getContext() {
@@ -175,6 +168,15 @@ private void saveClassesToDir() {
   private void saveToJar() {
     LOGGER.info("Saving output file: {}", this.options.outputJar());
 
+    // Create directories if not exists
+    if (this.options.outputJar().getParent() != null) {
+      try {
+        Files.createDirectories(this.options.outputJar().getParent());
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     try (ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(this.options.outputJar()))) {
       zipOutputStream.setLevel(9);
 
@@ -231,10 +233,9 @@ private void saveToJar() {
 
                 context.getFiles().remove(name);
               });
-    } catch (Exception e) {
+    } catch (IOException e) {
       LOGGER.error("Could not save output file: {}", this.options.outputJar());
-      LOGGER.debug("Error", e);
-      if (this.options.consoleDebug()) e.printStackTrace();
+      throw new RuntimeException(e);
     }
 
     LOGGER.info("Saved output file: {}\n", this.options.outputJar());

diff --git a/deobfuscator-impl/src/test/java/uwu/narumii/deobfuscator/base/TestDeobfuscationBase.java b/deobfuscator-impl/src/test/java/uwu/narumii/deobfuscator/base/TestDeobfuscationBase.java
@@ -111,7 +111,9 @@ private void runTest() {
         for (String sourceName : sources) {
           Path compiledClassPath = COMPILED_CLASSES_PATH.resolve(this.inputType.directory()).resolve(sourceName + ".class");
           if (Files.notExists(compiledClassPath)) {
-            throw new IllegalArgumentException("File not found: " + compiledClassPath.toAbsolutePath().normalize());
+            throw new IllegalArgumentException(
+                "Compiled class not found: '" + compiledClassPath.toAbsolutePath().normalize() + "'. You might forgot to compile the class. Use 'mvn test' to compile test classes."
+            );
           }
 
           // Add class