Merge pull request ow2-proactive#3196 from fviale/master

Fix for ow2-proactive#3195 DataSpace Client does not preserve directory hierarchy when transferring single file
MaelAudren · Apr 26, 2018 · cb8f043 · cb8f043
2 parents 5f09180 + 42cd5aa
commit cb8f043
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 81 deletions.
diff --git a/...-api/src/main/java/org/ow2/proactive_grid_cloud_portal/scheduler/client/utils/Zipper.java b/...-api/src/main/java/org/ow2/proactive_grid_cloud_portal/scheduler/client/utils/Zipper.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.zip.*;
 
+import org.apache.log4j.Logger;
 import org.objectweb.proactive.extensions.dataspaces.vfs.selector.FileSelector;
 
 import com.google.common.base.Predicate;
@@ -45,6 +46,8 @@
 
 public class Zipper {
 
+    private static final Logger logger = Logger.getLogger(Zipper.class);
+
     private static byte[] MAGIC = { 'P', 'K', 0x3, 0x4 };
 
     private Zipper() {
@@ -123,17 +126,10 @@ private static void zipFiles(List<File> files, String basepath, OutputStream os)
             try {
                 ZipOutputStream zos = new ZipOutputStream(os);
                 closer.register(zos);
-                if (files.size() == 1) {
-                    File file = files.get(0);
+                for (File file : files) {
                     FileInputStream inputStream = new FileInputStream(file);
                     closer.register(inputStream);
-                    writeZipEntry(new ZipEntry(file.getName()), inputStream, zos);
-                } else {
-                    for (File file : files) {
-                        FileInputStream inputStream = new FileInputStream(file);
-                        closer.register(inputStream);
-                        writeZipEntry(zipEntry(basepath, file), inputStream, zos);
-                    }
+                    writeZipEntry(zipEntry(basepath, file), inputStream, zos);
                 }
             } catch (IOException ioe) {
                 throw closer.rethrow(ioe);
@@ -146,6 +142,7 @@ public static void writeZipEntry(ZipEntry zipEntry, InputStream is, ZipOutputStr
             Closer closer = Closer.create();
             closer.register(is);
             try {
+                logger.trace("Adding zip entry" + zipEntry.toString());
                 zos.putNextEntry(zipEntry);
                 ByteStreams.copy(is, zos);
                 zos.flush();
@@ -259,7 +256,13 @@ public boolean apply(File file) {
 
             FileSelector selector = new FileSelector(includes, excludes);
 
-            return !file.isDirectory() && selector.matches(pathRelativeToRoot);
+            boolean answer = !file.isDirectory() && selector.matches(pathRelativeToRoot);
+            if (logger.isTraceEnabled()) {
+                logger.trace("Analysing file " + file + " for selector " + selector + " : " + answer);
+                logger.trace("Path relative to root : " + pathRelativeToRoot);
+            }
+
+            return answer;
         }
 
     }