Fix #7653. Allow to merge directories with the skip transfer option.

Former-commit-id: 9ba99ae64d2a21106939ab40cfe130c27921aac3
iterate-ch · Apr 7, 2014 · 22d9d84 · 22d9d84
1 parent 49a10e0
commit 22d9d84
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 10 deletions.
diff --git a/source/ch/cyberduck/core/transfer/download/SkipFilter.java b/source/ch/cyberduck/core/transfer/download/SkipFilter.java
@@ -43,7 +43,7 @@ public SkipFilter(final SymlinkResolver<Path> symlinkResolver, final Session<?>
 
     @Override
     public boolean accept(final Path file, final Local local, final TransferStatus parent) throws BackgroundException {
-        if(local.exists()) {
+        if(local.isFile() && local.exists()) {
             if(log.isInfoEnabled()) {
                 log.info(String.format("Skip file %s", file));
             }

diff --git a/source/ch/cyberduck/core/transfer/upload/SkipFilter.java b/source/ch/cyberduck/core/transfer/upload/SkipFilter.java
@@ -47,7 +47,7 @@ public SkipFilter(final SymlinkResolver<Local> symlinkResolver, final Session<?>
     @Override
     public boolean accept(final Path file, final Local local, final TransferStatus parent) throws BackgroundException {
         if(parent.isExists()) {
-            if(find.find(file)) {
+            if(local.isFile() && find.find(file)) {
                 if(log.isInfoEnabled()) {
                     log.info(String.format("Skip file %s", file));
                 }

diff --git a/test/ch/cyberduck/core/transfer/download/SkipFilterTest.java b/test/ch/cyberduck/core/transfer/download/SkipFilterTest.java
@@ -36,15 +36,41 @@ public void testAccept() throws Exception {
                                 public boolean exists() {
                                     return false;
                                 }
-                            }, new TransferStatus()
-        ));
+                            }, new TransferStatus().exists(true)
+        )
+        );
         assertFalse(f.accept(new Path("a", EnumSet.of(Path.Type.file)) {
                              }, new NullLocal("a", "b") {
                                  @Override
                                  public boolean exists() {
                                      return true;
                                  }
-                             }, new TransferStatus()
-        ));
+                             }, new TransferStatus().exists(true)
+        )
+        );
+    }
+
+    @Test
+    public void testAcceptDirectory() throws Exception {
+        SkipFilter f = new SkipFilter(new DisabledDownloadSymlinkResolver(), new NullSession(new Host("h")));
+        assertTrue(f.accept(new Path("a", EnumSet.of(Path.Type.directory)) {
+                            }, new NullLocal("a", "b") {
+                                @Override
+                                public boolean isFile() {
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean isDirectory() {
+                                    return true;
+                                }
+
+                                @Override
+                                public boolean exists() {
+                                    return true;
+                                }
+                            }, new TransferStatus().exists(true)
+        )
+        );
     }
 }
diff --git a/test/ch/cyberduck/core/transfer/upload/SkipFilterTest.java b/test/ch/cyberduck/core/transfer/upload/SkipFilterTest.java
@@ -1,11 +1,14 @@
 package ch.cyberduck.core.transfer.upload;
 
 import ch.cyberduck.core.AbstractTestCase;
+import ch.cyberduck.core.Cache;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.NullLocal;
 import ch.cyberduck.core.NullSession;
 import ch.cyberduck.core.Path;
+import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.NotfoundException;
+import ch.cyberduck.core.features.Find;
 import ch.cyberduck.core.transfer.TransferStatus;
 import ch.cyberduck.core.transfer.symlink.DisabledUploadSymlinkResolver;
 
@@ -23,13 +26,42 @@ public class SkipFilterTest extends AbstractTestCase {
 
     @Test
     public void testAccept() throws Exception {
+        SkipFilter f = new SkipFilter(new DisabledUploadSymlinkResolver(), new NullSession(new Host("h")) {
+            @Override
+            public <T> T getFeature(Class<T> type) {
+                if(type == Find.class) {
+                    return (T) new Find() {
+                        @Override
+                        public boolean find(Path file) throws BackgroundException {
+                            return true;
+                        }
+
+                        @Override
+                        public Find withCache(Cache cache) {
+                            return this;
+                        }
+                    };
+                }
+                return super.getFeature(type);
+            }
+        });
+        assertFalse(f.accept(new Path("a", EnumSet.of(Path.Type.file)), new NullLocal("a") {
+            @Override
+            public boolean exists() {
+                return true;
+            }
+        }, new TransferStatus().exists(true)));
+    }
+
+    @Test
+    public void testAcceptDirectory() throws Exception {
         SkipFilter f = new SkipFilter(new DisabledUploadSymlinkResolver(), new NullSession(new Host("h")));
-        assertTrue(f.accept(new Path("a", EnumSet.of(Path.Type.file)), new NullLocal("a") {
+        assertTrue(f.accept(new Path("a", EnumSet.of(Path.Type.directory)), new NullLocal("a") {
             @Override
             public boolean exists() {
                 return true;
             }
-        }, new TransferStatus()));
+        }, new TransferStatus().exists(true)));
     }
 
     @Test(expected = NotfoundException.class)
@@ -40,7 +72,6 @@ public void testNotFound() throws Exception {
             public boolean exists() {
                 return false;
             }
-        }, new TransferStatus()
-        ));
+        }, new TransferStatus().exists(true)));
     }
 }