handle pseudo-directories correctly for Swift sources

Closes #25.

Author: majewsky

CHANGELOG.md

@@ -11,6 +11,9 @@ Changes:
     Old:     DEBUG: skipping /files/1.txt: is not included by `[0-9].txt`
     New:     DEBUG: skipping /files/1.txt: /files/ is not included by `[0-9].txt`
 
+Bugfixes:
+- When using a Swift source, pseudo-directories are now recognized and transferred correctly.
+
 # v2.4.0 (2018-06-14)
 
 New features:

pkg/objects/swift.go

@@ -164,7 +164,11 @@ func (s *SwiftLocation) Connect() error {
 func (s *SwiftLocation) ObjectAtPath(path string) *schwift.Object {
 	objectName := strings.TrimPrefix(path, "/")
 	if s.ObjectNamePrefix != "" {
+		isPseudoDir := strings.HasSuffix(objectName, "/")
 		objectName = filepath.Join(s.ObjectNamePrefix, objectName)
+		if isPseudoDir {
+			objectName += "/"
+		}
 	}
 	return s.Container.Object(objectName)
 }

tests.sh

@@ -562,6 +562,35 @@ This file does not get cleaned up because it's not below object_prefix.
 Hello World.
 EOF
 
+################################################################################
+step 'Test 11: Swift sources with pseudo-directories'
+
+if [ "$1" = http ]; then
+  echo ">> Test skipped (works only with Swift source)."
+else
+
+upload_file_from_stdin pseudo/directory/ < /dev/null
+upload_file_from_stdin pseudo/regularfile.txt <<-EOF
+  Hello File.
+EOF
+
+mirror <<-EOF
+  swift: { $AUTH_PARAMS }
+  jobs:
+    - from: ${SOURCE_SPEC}
+      to:
+        container: ${CONTAINER_BASE}-test11
+      only: pseudo/
+EOF
+
+expect test11 <<-EOF
+>> pseudo/directory/
+>> pseudo/regularfile.txt
+Hello File.
+EOF
+
+fi # end of: if [ "$1" = http ]
+
 ################################################################################
 # cleanup before exiting