blobcopy maintains virtual dirs

kpfaulkner · Jul 10, 2017 · a27d8c1 · a27d8c1
1 parent c41b2ea
commit a27d8c1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/azurecopy/Handlers/AzureBlobCopyHandler.cs b/azurecopy/Handlers/AzureBlobCopyHandler.cs
@@ -115,7 +115,6 @@ public static void StartCopyList(IEnumerable<BasicBlobContainer> origBlobList, s
             {
                 try
                 {
-                    Console.WriteLine("Copy blob " + blob.DisplayName);
                     var bcd = AzureBlobCopyHandler.StartCopy(blob, destinationUrl, destBlobType, skipIfExists);
                     if (bcd != null)
                     {
@@ -164,7 +163,6 @@ public static void StartCopyList(IEnumerable<BasicBlobContainer> origBlobList, s
         // new name should be destination name + (blob.name - blob.prefix) 
         public static BlobCopyData StartCopy(BasicBlobContainer origBlob, string DestinationUrl, DestinationBlobType destBlobType, bool skipIfExists)
         {
-
             var client = AzureHelper.GetTargetCloudBlobClient(DestinationUrl);
             var opt = client.GetServiceProperties();
 
@@ -185,23 +183,28 @@ public static BlobCopyData StartCopy(BasicBlobContainer origBlob, string Destina
             {
                 blobWithoutPrefix = origBlob.Name.Substring(origBlob.BlobPrefix.Length);
             }
-
+            
             if (!string.IsNullOrWhiteSpace(blobWithoutPrefix))
             {
-                blobName = string.Format("{0}/{1}", destBlobPrefix, blobWithoutPrefix);
+                if (!string.IsNullOrWhiteSpace(destBlobPrefix))
+                {
+                    blobName = string.Format("{0}/{1}", destBlobPrefix, blobWithoutPrefix);
+                }
+                else
+                {
+                    blobName = blobWithoutPrefix;
+                }
+
             }
             else
-            {
-                // need to get just filename. ie last element of /
-                var actualBlobName = origBlob.Name.Split('/').Last();
-
+            {                
                 if (string.IsNullOrWhiteSpace(destBlobPrefix))
                 {
-                    blobName = actualBlobName;
+                    blobName = origBlob.Name;
                 }
                 else
                 {
-                    blobName = string.Format("{0}/{1}", destBlobPrefix, actualBlobName);
+                    blobName = string.Format("{0}/{1}", destBlobPrefix, origBlob.Name);
                 }
             }
 

diff --git a/azurecopy/Properties/AssemblyInfo.cs b/azurecopy/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.3")]
-[assembly: AssemblyFileVersion("1.4.3")]
+[assembly: AssemblyVersion("1.5.0")]
+[assembly: AssemblyFileVersion("1.5.0")]
diff --git a/azurecopycommand/Properties/AssemblyInfo.cs b/azurecopycommand/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.3")]
-[assembly: AssemblyFileVersion("1.4.3")]
+[assembly: AssemblyVersion("1.5.0")]
+[assembly: AssemblyFileVersion("1.5.0")]