Add comma separation support to -e and --only, improve class allowlisting

Author: jaskarth

src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java

@@ -129,9 +129,11 @@ else if (args.length > x+1) {
         if (arg.equals("-s") || arg.equals("--silent")) {
           mapOptions.put(IFernflowerPreferences.LOG_LEVEL, "error");
         } else if (arg.startsWith("-e=") || arg.startsWith("--add-external=")) {
-          addPath(libraries, arg.substring(arg.indexOf('=') + 1));
+          for (String path : arg.substring(arg.indexOf('=') + 1).split(",")) {
+            addPath(libraries, path);
+          }
         } else if (arg.startsWith("-only=") || arg.startsWith("--only=")) {
-          whitelist.add(arg.substring(arg.indexOf('=') + 1));
+          whitelist.addAll(Arrays.asList(arg.substring(arg.indexOf('=') + 1).split(",")));
         } else {
           if (lastPath != null) {
             addPath(sources, lastPath);

src/org/jetbrains/java/decompiler/main/decompiler/ConsoleHelp.java

@@ -32,9 +32,9 @@ public class ConsoleHelp {
     "If unspecified, the decompiled source will be automatically detected based on destination name.",
     "",
     "--- General options ---",
-    "These options can be specified multiple times.",
+    "These options can be specified multiple times. Multiple values can be passed in with commas.",
     "-e=<path>, --add-external=<path> - Add the specified path to the list of external libraries",
-    "-only=<class>, --only=<class>    - Only decompile the specified class",
+    "-only=<pattern>, --only=<pattern>    - Only decompile classes starting with the given pattern",
     "",
     "--- Additional options ---",
     "These options take the last specified value.",

src/org/jetbrains/java/decompiler/struct/ContextUnit.java

@@ -128,14 +128,26 @@ public void save(final Function<String, StructClass> loader) throws IOException
 
     sink.begin();
 
+    final DecompilerContext rootContext = DecompilerContext.getCurrentContext();
+
+    Set<String> otherNames = otherEntries.stream().map(IContextSource.Entry::path).collect(Collectors.toSet());
+
     // directory entries
     for (String dirEntry : dirEntries) {
-      sink.acceptDirectory(dirEntry);
+      boolean write = true;
+      if (!rootContext.classProcessor.isWhitelisted(dirEntry)) {
+        // not allowed? check if an other entry starts with this path
+        write = otherNames.stream().anyMatch(s -> s.startsWith(dirEntry));
+      }
+
+      if (write) {
+        sink.acceptDirectory(dirEntry);
+      }
     }
 
     // non-class entries
-    for (IContextSource.Entry otherEntry : otherEntries) {
-      sink.acceptOther(otherEntry.path());
+    for (String otherEntry : otherNames) {
+      sink.acceptOther(otherEntry);
     }
 
     //Whooo threads!
@@ -145,7 +157,6 @@ public void save(final Function<String, StructClass> loader) throws IOException
       threads = Runtime.getRuntime().availableProcessors();
     }
     ForkJoinPool pool = new ForkJoinPool(threads, namingScheme(), null, true);
-    final DecompilerContext rootContext = DecompilerContext.getCurrentContext();
     final List<ClassContext> toDump = new ArrayList<>(classEntries.size());
     Set<String> seen = new LinkedHashSet<>();