Fixes #35, "Save All source dose not work"

emmanue1 · emmanue1 · commit 12c9c351e3e1 · 2015-08-11T23:50:33.000+02:00
diff --git a/api/src/main/java/org/jd/gui/spi/SourceSaver.java b/api/src/main/java/org/jd/gui/spi/SourceSaver.java
@@ -20,7 +20,19 @@ public interface SourceSaver {
 
     public int getFileCount(API api, Container.Entry entry);
 
-    public void save(API api, Controller controller, Listener listener, Path path, Container.Entry entry);
+    /**
+     * Check parent path, build source file name, create NIO path and save the content.
+     */
+    public void save(API api, Controller controller, Listener listener, Path rootPath, Container.Entry entry);
+
+    /**
+     * Save content:
+     * <ul>
+     * <li>For file, save the source content.</li>
+     * <li>For directory, call 'save' for each children.</li>
+     * </ul>
+     */
+    public void saveContent(API api, Controller controller, Listener listener, Path rootPath, Path path, Container.Entry entry);
 
     public interface Controller {
         public boolean isCancelled();
diff --git a/app/src/main/groovy/org/jd/gui/service/mainpanel/ContainerPanelFactoryProvider.groovy b/app/src/main/groovy/org/jd/gui/service/mainpanel/ContainerPanelFactoryProvider.groovy
@@ -22,12 +22,15 @@ import org.jd.gui.view.component.panel.TreeTabbedPanel
 import javax.swing.JComponent
 import javax.swing.tree.DefaultMutableTreeNode
 import javax.swing.tree.DefaultTreeModel
+import java.nio.file.FileSystems
+import java.nio.file.Files
 import java.nio.file.Path
 
 class ContainerPanelFactoryProvider implements PanelFactory {
 
-	String[] getTypes() { ['default'] }
+	@Override String[] getTypes() { ['default'] }
 
+    @Override
     public <T extends JComponent & UriGettable> T make(API api, Container container) {
         return new ContainerPanel(api, container)
 	}
@@ -53,6 +56,7 @@ class ContainerPanelFactoryProvider implements PanelFactory {
         }
 
         // --- ContentIndexable --- //
+        @Override
         @CompileStatic
         Indexes index(API api) {
             // Classic map
@@ -71,40 +75,54 @@ class ContainerPanelFactoryProvider implements PanelFactory {
             }
             // Index populating value automatically
             def indexesWithDefault = new Indexes() {
-                void waitIndexers() {}
-                Map<String, Collection> getIndex(String name) {
-                    mapWithDefault.get(name)
-                }
+                @Override void waitIndexers() {}
+                @Override Map<String, Collection> getIndex(String name) { mapWithDefault.get(name) }
             }
 
             api.getIndexer(entry)?.index(api, entry, indexesWithDefault)
 
             // To prevent memory leaks, return an index without the 'populate' behaviour
             return new Indexes() {
-                void waitIndexers() {}
-                Map<String, Collection> getIndex(String name) { map.get(name) }
+                @Override void waitIndexers() {}
+                @Override Map<String, Collection> getIndex(String name) { map.get(name) }
             }
         }
 
         // --- SourcesSavable --- //
+        @Override
         String getSourceFileName() {
             def path = api.getSourceSaver(entry)?.getSourcePath(entry)
             int index = path.lastIndexOf('/')
             return path.substring(index+1)
         }
 
-        int getFileCount() { api.getSourceSaver(entry)?.getFileCount(api, entry) }
+        @Override int getFileCount() { api.getSourceSaver(entry)?.getFileCount(api, entry) }
 
+        @Override
         void save(API api, Controller controller, Listener listener, Path path) {
-            api.getSourceSaver(entry)?.save(
+            def parentPath = path.parent
+
+            if (parentPath && !Files.exists(parentPath)) {
+                Files.createDirectories(parentPath)
+            }
+
+            def uri = path.toUri()
+            def archiveUri = new URI('jar:' + uri.scheme, uri.host, uri.path + '!/', null)
+            def archiveFs = FileSystems.newFileSystem(archiveUri, [create: 'true'])
+            def archiveRootPath = archiveFs.getPath('/')
+
+            api.getSourceSaver(entry)?.saveContent(
                     api,
                     new SourceSaver.Controller() {
                         boolean isCancelled() { controller.isCancelled() }
                     },
                     new SourceSaver.Listener() {
                         void pathSaved(Path p) { listener.pathSaved(p) }
                     },
-                    path, entry)
+                archiveRootPath, archiveRootPath, entry
+            )
+
+            archiveFs.close()
         }
     }
 }
diff --git a/services/src/main/groovy/org/jd/gui/service/sourcesaver/DirectorySourceSaverProvider.groovy b/services/src/main/groovy/org/jd/gui/service/sourcesaver/DirectorySourceSaverProvider.groovy
@@ -18,11 +18,11 @@ class DirectorySourceSaverProvider extends AbstractSourceSaverProvider {
     /**
      * @return local + optional external selectors
      */
-    String[] getSelectors() { ['*:dir:*'] + externalSelectors }
+    @Override String[] getSelectors() { ['*:dir:*'] + externalSelectors }
 
-    String getSourcePath(Container.Entry entry) { entry.path }
+    @Override String getSourcePath(Container.Entry entry) { entry.path + '.src.zip' }
 
-    int getFileCount(API api, Container.Entry entry) { getFileCount(api, entry.children) }
+    @Override int getFileCount(API api, Container.Entry entry) { getFileCount(api, entry.children) }
 
     @CompileStatic
     protected int getFileCount(API api, Collection<Container.Entry> entries) {
@@ -35,26 +35,27 @@ class DirectorySourceSaverProvider extends AbstractSourceSaverProvider {
         return count
     }
 
-    void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path path, Container.Entry entry) {
-        save(api, controller, listener, path, entry.children)
-    }
-
+    @Override
     @CompileStatic
-    protected void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path path, Collection<Container.Entry> entries) {
+    public void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path rootPath, Container.Entry entry) {
+        Path path = rootPath.resolve(entry.getPath())
+
         Files.createDirectories(path)
 
-        for (def e : entries) {
+        saveContent(api, controller, listener, rootPath, path, entry);
+    }
+
+    @Override
+    @CompileStatic
+    public void saveContent(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path rootPath, Path path, Container.Entry entry) {
+        for (def e : getChildren(entry)) {
             if (controller.isCancelled()) {
                 break
             }
 
-            def saver = api.getSourceSaver(e)
-
-            if (saver) {
-                def sp = saver.getSourcePath(e)
-                def p = path.fileSystem.getPath(sp)
-                saver.save(api, controller, listener, p, e)
-            }
+            api.getSourceSaver(e)?.save(api, controller, listener, rootPath, e)
         }
     }
+
+    protected Collection<Container.Entry> getChildren(Container.Entry entry) { entry.children }
 }
diff --git a/services/src/main/groovy/org/jd/gui/service/sourcesaver/FileSourceSaverProvider.groovy b/services/src/main/groovy/org/jd/gui/service/sourcesaver/FileSourceSaverProvider.groovy
@@ -19,14 +19,21 @@ class FileSourceSaverProvider extends AbstractSourceSaverProvider {
     /**
      * @return local + optional external selectors
      */
-    String[] getSelectors() { ['*:file:*'] + externalSelectors }
+    @Override String[] getSelectors() { ['*:file:*'] + externalSelectors }
 
-    String getSourcePath(Container.Entry entry) { entry.path }
+    @Override String getSourcePath(Container.Entry entry) { entry.path }
 
-    int getFileCount(API api, Container.Entry entry) { 1 }
+    @Override int getFileCount(API api, Container.Entry entry) { 1 }
 
+    @Override
     @CompileStatic
-    void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path path, Container.Entry entry) {
+    public void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path rootPath, Container.Entry entry) {
+        saveContent(api, controller, listener, rootPath, rootPath.resolve(entry.getPath()), entry);
+    }
+
+    @Override
+    @CompileStatic
+    void saveContent(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path rootPath, Path path, Container.Entry entry) {
         listener.pathSaved(path)
 
         entry.inputStream.withStream { InputStream is ->
diff --git a/services/src/main/groovy/org/jd/gui/service/sourcesaver/PackageSourceSaverProvider.groovy b/services/src/main/groovy/org/jd/gui/service/sourcesaver/PackageSourceSaverProvider.groovy
@@ -5,20 +5,17 @@
 
 package org.jd.gui.service.sourcesaver
 
-import org.jd.gui.api.API
 import org.jd.gui.api.model.Container
-import org.jd.gui.spi.SourceSaver
 import org.jd.gui.util.JarContainerEntryUtil
 
-import java.nio.file.Path
-
 class PackageSourceSaverProvider extends DirectorySourceSaverProvider {
     /**
      * @return local + optional external selectors
      */
-    String[] getSelectors() { ['jar:dir:*', 'war:dir:*', 'ear:dir:*'] + externalSelectors }
+    @Override String[] getSelectors() { ['jar:dir:*', 'war:dir:*', 'ear:dir:*'] + externalSelectors }
 
-    void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path path, Container.Entry entry) {
-        save(api, controller, listener, path, JarContainerEntryUtil.removeInnerTypeEntries(entry.children))
+    @Override
+    protected Collection<Container.Entry> getChildren(Container.Entry entry) {
+        JarContainerEntryUtil.removeInnerTypeEntries(entry.children)
     }
 }
diff --git a/services/src/main/groovy/org/jd/gui/service/sourcesaver/ZipFileSourceSaverProvider.groovy b/services/src/main/groovy/org/jd/gui/service/sourcesaver/ZipFileSourceSaverProvider.groovy
@@ -20,31 +20,32 @@ class ZipFileSourceSaverProvider extends DirectorySourceSaverProvider {
     /**
      * @return local + optional external selectors
      */
-    String[] getSelectors() { ['*:file:*.zip', '*:file:*.jar', '*:file:*.war', '*:file:*.ear'] + externalSelectors }
-
-    String getSourcePath(Container.Entry entry) { entry.path + '.src.zip' }
+    @Override String[] getSelectors() { ['*:file:*.zip', '*:file:*.jar', '*:file:*.war', '*:file:*.ear'] + externalSelectors }
 
+    @Override
     @CompileStatic
-    void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path path, Container.Entry entry) {
+    public void save(API api, SourceSaver.Controller controller, SourceSaver.Listener listener, Path rootPath, Container.Entry entry) {
+        def sourcePath = getSourcePath(entry)
+        def path = rootPath.resolve(sourcePath)
+        def parentPath = path.parent
+
+        if (parentPath && !Files.exists(parentPath)) {
+            Files.createDirectories(parentPath)
+        }
+
         def tmpFile = File.createTempFile('jd-gui.', '.tmp.zip')
         tmpFile.delete()
 
-        def env = new HashMap<String, String>()
-        env.put('create', 'true')
-
         def tmpFileUri = tmpFile.toURI()
-        def tmpURI = new URI('jar:' + tmpFileUri.scheme, tmpFileUri.host, tmpFileUri.path + '!/', null)
-        def tmpFs = FileSystems.newFileSystem(tmpURI, env);
+        def tmpArchiveUri = new URI('jar:' + tmpFileUri.scheme, tmpFileUri.host, tmpFileUri.path + '!/', null)
+        def tmpArchiveFs = FileSystems.newFileSystem(tmpArchiveUri, [create: 'true']);
+        def tmpArchiveRootPath = tmpArchiveFs.getPath('/')
 
-        super.save(api, controller, listener, tmpFs.getPath('/'), entry)
-        tmpFs.close()
+        saveContent(api, controller, listener, tmpArchiveRootPath, tmpArchiveRootPath, entry)
 
-        def tmpPath = Paths.get(tmpFile.absolutePath)
-        def srcZipParentPath = path.parent
+        tmpArchiveFs.close()
 
-        if (srcZipParentPath && !Files.exists(srcZipParentPath)) {
-            Files.createDirectories(srcZipParentPath)
-        }
+        def tmpPath = Paths.get(tmpFile.absolutePath)
 
         Files.move(tmpPath, path)
     }
diff --git a/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java b/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java
@@ -5,7 +5,6 @@
 
 package org.jd.gui.service.sourcesaver;
 
-import groovy.transform.CompileStatic;
 import jd.core.CoreConstants;
 import jd.core.Decompiler;
 import jd.core.process.DecompilerImpl;
@@ -41,6 +40,7 @@ public class ClassFileSourceSaverProvider extends AbstractSourceSaverProvider {
     /**
      * @return local + optional external selectors
      */
+    @Override
     public String[] getSelectors() {
         List<String> externalSelectors = getExternalSelectors();
 
@@ -55,13 +55,15 @@ public String[] getSelectors() {
         }
     }
 
+    @Override
     public String getSourcePath(Container.Entry entry) {
         String path = entry.getPath();
         int index = path.lastIndexOf('.');
         String prefix = (index == -1) ? path : path.substring(0, index);
         return prefix + ".java";
     }
 
+    @Override
     public int getFileCount(API api, Container.Entry entry) {
         if (entry.getPath().indexOf('$') == -1) {
             return 1;
@@ -70,7 +72,16 @@ public int getFileCount(API api, Container.Entry entry) {
         }
     }
 
-    public void save(API api, Controller controller, Listener listener, Path path, Container.Entry entry) {
+    @Override
+    public void save(API api, Controller controller, Listener listener, Path rootPath, Container.Entry entry) {
+        String sourcePath = getSourcePath(entry);
+        Path path = rootPath.resolve(sourcePath);
+
+        saveContent(api, controller, listener, rootPath, path, entry);
+    }
+
+    @Override
+    public void saveContent(API api, Controller controller, Listener listener, Path rootPath, Path path, Container.Entry entry) {
         try {
             // Call listener
             if (path.toString().indexOf('$') == -1) {
@@ -137,7 +148,6 @@ public void save(API api, Controller controller, Listener listener, Path path, C
         }
     }
 
-    @CompileStatic
     protected static boolean getPreferenceValue(Map<String, String> preferences, String key, boolean defaultValue) {
         String v = preferences.get(key);
 
