Remove folder functionality, needs to be rewritten

Author: rcx

src/main/java/club/bytecode/the/jda/FileContainer.java

@@ -20,25 +20,38 @@ public FileContainer(File f) {
         this.name = f.getAbsolutePath();
     }
 
-    public File file;
-    public String name;
+    public final File file;
+    public final String name;
 
     public HashMap<String, byte[]> files = new HashMap<>();
     private Map<String, ClassNode> classes = new HashMap<>();
 
     public ClassNode getClassNode(String name) {
-        if (!classes.containsKey(name)) {
-            byte[] bytes = files.get(name);
-            if (bytes != null) {
-                ClassReader reader = new ClassReader(bytes);
-                ClassNode classNode = new ClassNode();
-                reader.accept(classNode, ClassReader.EXPAND_FRAMES);
-                classes.put(name, classNode);
-            }
-        }
+        if (classes.containsKey(name))
+            return classes.get(name);
+        ClassNode cn = loadClass(findClassfile(name));
+        if (cn != null)
+            classes.put(name, cn);
         return classes.get(name);
     }
 
+    public ClassNode loadClass(String name) {
+        byte[] bytes = files.get(name);
+        if (bytes == null)
+            return null;
+        ClassReader reader = new ClassReader(bytes);
+        ClassNode classNode = new ClassNode();
+        reader.accept(classNode, ClassReader.EXPAND_FRAMES);
+        return classNode;
+    }
+
+    public String findClassfile(String className) {
+        String candidate = className + ".class";
+        if (files.containsKey(candidate))
+            return candidate;
+        return "";
+    }
+
     public Map<String, byte[]> getData() {
         return files;
     }
@@ -54,4 +67,9 @@ public void add(ClassNode classNode) {
     public Collection<ClassNode> getClasses() {
         return classes.values();
     }
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }

src/main/java/club/bytecode/the/jda/JDA.java

@@ -23,9 +23,10 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class JDA {
     /*per version*/
@@ -151,15 +152,6 @@ private static void onExit() {
         Settings.saveGUI();
     }
 
-    /**
-     * Returns the currently opened ClassNode
-     *
-     * @return the currently opened ClassNode
-     */
-    public static ClassNode getCurrentlyOpenedClassNode() {
-        return viewer.FileViewerPane.getCurrentViewer().cn;
-    }
-
     public static byte[] getFileBytes(FileContainer container, String name) {
         if (container != null)
             return container.getData().get(name);
@@ -168,7 +160,7 @@ public static byte[] getFileBytes(FileContainer container, String name) {
     }
 
     public static byte[] getClassBytes(FileContainer container, ClassNode cn) {
-        byte[] bytes = getFileBytes(container, getClassfileName(cn));
+        byte[] bytes = getFileBytes(container, container.findClassfile(cn.name));
         if (bytes == null)
             return null;
         if (cn.version < 49)
@@ -179,19 +171,19 @@ public static byte[] getClassBytes(FileContainer container, ClassNode cn) {
     public static final String HACK_PREFIX = "\0JDA-hack";
 
     public static File getClassFileProxy(ClassNode cn) {
-        return new File('/' + HACK_PREFIX, getClassfileName(cn));
+        return new File('/' + HACK_PREFIX, cn + ".class");
     }
 
-    public static String getClassfileName(ClassNode cn) {
-        return cn.name + ".class";
+    public static String extractProxyClassName(String fileName) {
+        return getClassFilePath(fileName.substring(fileName.indexOf(HACK_PREFIX) + HACK_PREFIX.length() + 1));
     }
 
-    public static String extractProxyClassName(String fileName) {
-        return extractClassName(fileName.substring(fileName.indexOf(HACK_PREFIX) + HACK_PREFIX.length() + 1));
+    public static String getClassFilePath(String fileName) {
+        return fileName.replace(File.separator, "/").substring(0, fileName.length() - ".class".length());
     }
 
-    public static String extractClassName(String fileName) {
-        return fileName.replace(File.separator, "/").substring(0, fileName.length() - 6);
+    public static String getClassName(String fullyQualifiedName) {
+        return fullyQualifiedName.substring(fullyQualifiedName.lastIndexOf('/') + 1);
     }
 
     protected static byte[] fixBytes(byte[] in) {
@@ -248,6 +240,7 @@ public static ArrayList<ClassNode> loadAllClasses() {
         return a;
     }
 
+    // WTF????
     public static Map<String, byte[]> getLoadedBytes() {
         Map<String, byte[]> data = new HashMap<>();
         for (FileContainer container : files) {
@@ -281,35 +274,7 @@ public static void openFiles(final File[] files, boolean recentFiles) {
                         update = false;
                         showMessage("The file " + fileToOpen.getAbsolutePath() + " could not be found.");
                     } else if (fileToOpen.isDirectory()) {
-                        FileContainer container = new FileContainer(fileToOpen);
-                        HashMap<String, byte[]> openedFiles = new HashMap<>();
-                        Set<File> totalFiles = new HashSet<>();
-                        Deque<File> queue = new ArrayDeque<>();
-                        queue.add(fileToOpen);
-                        String dir = fileToOpen.getAbsolutePath();//f.getAbsolutePath().substring(0, f.getAbsolutePath().length()-f.getName().length());
-
-                        while (!queue.isEmpty()) {
-                            File file = queue.remove();
-                            if (!totalFiles.add(file))
-                                continue;
-                            if (file.listFiles() != null) { // is directory
-                                for (File child : file.listFiles()) {
-                                    if (!totalFiles.contains(child)) {
-                                        queue.add(child);
-                                    }
-                                }
-                            }
-                        }
-
-                        for (File file : totalFiles) {
-                            if (file.isFile()) {
-                                String fileName = file.getAbsolutePath().substring(dir.length() + 1, file.getAbsolutePath().length()).replaceAll("\\\\", "\\/");
-                                openedFiles.put(fileName, Files.readAllBytes(Paths.get(file.getAbsolutePath())));
-                            }
-                        }
-
-                        container.files = openedFiles;
-                        addFile(container);
+                        openFiles(fileToOpen.listFiles(), false);
                     } else if (fn.endsWith(".jar") || fn.endsWith(".zip")) {
                         try {
                             JarUtils.put(fileToOpen);
@@ -318,30 +283,12 @@ public static void openFiles(final File[] files, boolean recentFiles) {
                             update = false;
                         }
                     } else if (fn.endsWith(".class")) {
-                        try {
-                            byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
-                            String cafebabe = String.format("%02X%02X%02X%02X", bytes[0], bytes[1], bytes[2], bytes[3]);
-                            if (cafebabe.toLowerCase().equals("cafebabe")) {
-                                final ClassNode cn = JarUtils.getNode(bytes);
-
-                                FileContainer container = new FileContainer(fileToOpen);
-                                container.files.put(getClassfileName(cn), bytes);
-                                container.add(cn);
-                                addFile(container);
-                            } else {
-                                showMessage(fn + ": Header does not start with CAFEBABE, ignoring.");
-                                update = false;
-                            }
-                        } catch (final Exception e) {
-                            new ExceptionUI(e);
-                            update = false;
-                        }
+                        FileContainer container = loadClassfile(fileToOpen, fn);
+                        addFile(container);
                     } else {
                         HashMap<String, byte[]> files1 = new HashMap<>();
                         byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
                         files1.put(fileToOpen.getName(), bytes);
-
-
                         FileContainer container = new FileContainer(fileToOpen);
                         container.files = files1;
                         addFile(container);
@@ -362,6 +309,27 @@ public static void openFiles(final File[] files, boolean recentFiles) {
         })).start();
     }
 
+    public static FileContainer loadClassfile(File fileToOpen, String fn) {
+        try {
+            byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
+            String cafebabe = String.format("%02X%02X%02X%02X", bytes[0], bytes[1], bytes[2], bytes[3]);
+            if (cafebabe.toLowerCase().equals("cafebabe")) {
+                final ClassNode cn = JarUtils.getNode(bytes);
+                FileContainer container = new FileContainer(fileToOpen);
+                container.files.put(cn.name + ".class", bytes);
+                container.add(cn);
+                return container;
+            } else {
+                showMessage(fn + ": Header does not start with CAFEBABE, ignoring.");
+                update = false;
+            }
+        } catch (final Exception e) {
+            new ExceptionUI(e);
+            update = false;
+        }
+        return null;
+    }
+
     public static void addFile(FileContainer fc) {
         JDA.files.add(fc);
         plugins.forEach((plugin -> plugin.onAddFile(fc)));

src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java

@@ -98,7 +98,7 @@ public String getName() {
     @Override
     public String decompileClassNode(FileContainer container, ClassNode cn) {
         try {
-            byte[] bytes = JDA.getClassBytes(containerName, cn);
+            byte[] bytes = JDA.getClassBytes(container, cn);
             Options options = new GetOptParser().parse(generateMainMethod(), OptionsImpl.getFactory());
             ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
             DCCommonState dcCommonState = new DCCommonState(options, classFileSource);

src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java

@@ -61,12 +61,12 @@ public String decompileClassNode(FileContainer container, final ClassNode cn) {
             result.set(null);
 
             BaseDecompiler baseDecompiler = new BaseDecompiler((externalPath, internalPath) -> {
-                ClassNode requestedCn = JDA.getClassNode(containerName, JDA.extractProxyClassName(externalPath));
+                ClassNode requestedCn = container.getClassNode(JDA.extractProxyClassName(externalPath));
                 if (requestedCn == null) {
                     System.err.println("Couldn't load " + externalPath);
-                    throw new IOException(containerName + "$" + cn + " is missing");
+                    throw new IOException(container + "$" + cn + " is missing");
                 }
-                return JDA.getClassBytes(containerName, requestedCn);
+                return JDA.getClassBytes(container, requestedCn);
             }, new IResultSaver() {
                 @Override
                 public void saveFolder(String s) {
@@ -118,7 +118,7 @@ public void closeArchive(String s, String s1) {
                 visited.add(curCn);
                 baseDecompiler.addSpace(JDA.getClassFileProxy(curCn), true);
                 for (InnerClassNode innerClass : curCn.innerClasses) {
-                    ClassNode innerCn = JDA.getClassNode(containerName, innerClass.name);
+                    ClassNode innerCn = container.getClassNode(innerClass.name);
                     if (innerCn != null && !visited.contains(innerCn)) {
                         fifo.add(innerCn);
                     }

src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java

@@ -71,7 +71,7 @@ public DecompilerSettings getDecompilerSettings() {
     @Override
     public String decompileClassNode(FileContainer container, final ClassNode cn) {
         try {
-            byte[] bytes = JDA.getClassBytes(containerName, cn);
+            byte[] bytes = JDA.getClassBytes(container, cn);
             final Map<String, byte[]> loadedClasses = JDA.getLoadedBytes();
             MetadataSystem metadataSystem = new MetadataSystem(new ITypeLoader() {
                 private InputTypeLoader backLoader = new InputTypeLoader();

src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java

@@ -34,7 +34,7 @@ public String getName() {
     }
 
     public String decompileClassNode(FileContainer container, ClassNode cn) {
-        return decompile(new PrefixedStringBuilder(), new ArrayList<>(), containerName, cn).toString();
+        return decompile(new PrefixedStringBuilder(), new ArrayList<>(), container, cn).toString();
     }
 
     protected PrefixedStringBuilder decompile(PrefixedStringBuilder sb, ArrayList<String> decompiledClasses, FileContainer container, ClassNode cn) {
@@ -82,11 +82,11 @@ protected PrefixedStringBuilder decompile(PrefixedStringBuilder sb, ArrayList<St
                 String innerClassName = innerClassNode.name;
                 if ((innerClassName != null) && !decompiledClasses.contains(innerClassName)) {
                     decompiledClasses.add(innerClassName);
-                    ClassNode cn1 = JDA.getClassNode(containerName, innerClassName);
+                    ClassNode cn1 = container.getClassNode(innerClassName);
                     if (cn1 != null) {
                         sb.appendPrefix("     ");
                         sb.append(JDA.nl + JDA.nl);
-                        sb = decompile(sb, decompiledClasses, containerName, cn1);
+                        sb = decompile(sb, decompiledClasses, container, cn1);
                         sb.trimPrefix(5);
                         sb.append(JDA.nl);
                     } else {

src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java

@@ -25,6 +25,7 @@
  */
 
 public class ClassViewer extends Viewer {
+    public ClassNode cn;
     private static final long serialVersionUID = -8650495368920680024L;
     private List<Thread> decompileThreads = new ArrayList<>();
 

src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java

@@ -2,13 +2,11 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.settings.Settings;
-import org.objectweb.asm.tree.ClassNode;
 
 import javax.swing.*;
 
 public abstract class Viewer extends JPanel {
-
-    public ClassNode cn;
+    protected String pathInContainer; // path within the container
     public String name;
     public FileContainer container;
 

src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java

@@ -221,7 +221,7 @@ public void updateTree() {
         try {
             treeRoot.removeAllChildren();
             for (FileContainer container : JDA.files) {
-                FileNode root = new FileNode(container.name);
+                FileNode root = new FileNode(container);
                 treeRoot.add(root);
                 JDATreeCellRenderer renderer = new JDATreeCellRenderer();
                 tree.setCellRenderer(renderer);
@@ -407,15 +407,27 @@ public void openPath(TreePath path) {
             }
         }
 
+        FileContainer container = null;
+        for (int i = path.getPathCount() - 1; i > 0; i--) {
+            Object o = ((FileNode) path.getPathComponent(1)).getUserObject();
+            if (o != null && o instanceof FileContainer) {
+                container = (FileContainer) o;
+                break;
+            }
+        }
+        if (container == null) {
+            System.err.println(path);
+            throw new IllegalStateException("Path isn't parented to a container?");
+        }
+
         String name = nameBuffer.toString();
-        String containerName = path.getPathComponent(1).toString();
         if (name.endsWith(".class")) {
-            final ClassNode cn = JDA.getClassNode(containerName, name);
+            final ClassNode cn = container.loadClass(name);
             if (cn != null) {
-                openClassFileToWorkSpace(nameBuffer.toString(), containerName, cn);
+                openClassFileToWorkSpace(nameBuffer.toString(), container, cn);
             }
         } else {
-            openFileToWorkSpace(nameBuffer.toString(), containerName, JDA.getFileBytes(containerName, nameBuffer.toString()));
+            openFileToWorkSpace(nameBuffer.toString(), container, JDA.getFileBytes(container, nameBuffer.toString()));
         }
     }