Implement follow-symlink

Azure · Dec 27, 2017 · d9cda3f · d9cda3f
1 parent 9f2f398
commit d9cda3f
Show file tree

Hide file tree

Showing 10 changed files with 247 additions and 37 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/lib/Resources.Designer.cs b/lib/Resources.Designer.cs
diff --git a/lib/Resources.resx b/lib/Resources.resx
@@ -345,6 +345,10 @@ MD5 in property: {2}</value>
     <value>Failed to enumerate directory {0} with file pattern {1}.</value>
     <comment>{0} is the directory path, {1} is file pattern.</comment>
   </data>
+  <data name="EnumerateDirectoryException" xml:space="preserve">
+    <value>Failed to enumerate directory {0}.</value>
+    <comment>{0} is the directory path.</comment>
+  </data>
   <data name="FailedToValidateDestinationException" xml:space="preserve">
     <value>Failed to validate destination.</value>
   </data>

diff --git a/lib/TransferEnumerators/EnumerateDirectoryHelper.cs b/lib/TransferEnumerators/EnumerateDirectoryHelper.cs
diff --git a/lib/TransferEnumerators/FileEnumerator.cs b/lib/TransferEnumerators/FileEnumerator.cs
@@ -24,13 +24,17 @@ internal class FileEnumerator : TransferEnumeratorBase, ITransferEnumerator
 
         private FileListContinuationToken listContinuationToken;
 
+        private bool followSymlink;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="FileEnumerator" /> class.
         /// </summary>
         /// <param name="location">Directory location.</param>
-        public FileEnumerator(DirectoryLocation location)
+        /// <param name="followsymlink">Indicating whether to enumerate symlinked subdirectories.</param>
+        public FileEnumerator(DirectoryLocation location, bool followSymlink)
         {
             this.location = location;
+            this.followSymlink = followSymlink;
         }
 
         /// <summary>
@@ -92,6 +96,7 @@ public IEnumerable<TransferEntry> EnumerateLocation(CancellationToken cancellati
                     filePattern,
                     this.listContinuationToken == null ? null : this.listContinuationToken.FilePath,
                     searchOption,
+                    followSymlink,
                     cancellationToken);
             }
             catch (Exception ex)

diff --git a/lib/TransferManager.cs b/lib/TransferManager.cs
@@ -314,7 +314,7 @@ public static Task<TransferStatus> UploadDirectoryAsync(string sourcePath, Cloud
         {
             DirectoryLocation sourceLocation = new DirectoryLocation(sourcePath);
             AzureBlobDirectoryLocation destLocation = new AzureBlobDirectoryLocation(destBlobDir);
-            FileEnumerator sourceEnumerator = new FileEnumerator(sourceLocation);
+            FileEnumerator sourceEnumerator = new FileEnumerator(sourceLocation, null != options? options.FollowSymlink : false);
             if (options != null)
             {
                 sourceEnumerator.SearchPattern = options.SearchPattern;
@@ -361,7 +361,7 @@ public static Task<TransferStatus> UploadDirectoryAsync(string sourcePath, Cloud
         {
             DirectoryLocation sourceLocation = new DirectoryLocation(sourcePath);
             AzureFileDirectoryLocation destLocation = new AzureFileDirectoryLocation(destFileDir);
-            FileEnumerator sourceEnumerator = new FileEnumerator(sourceLocation);
+            FileEnumerator sourceEnumerator = new FileEnumerator(sourceLocation, options.FollowSymlink);
             if (options != null)
             {
                 sourceEnumerator.SearchPattern = options.SearchPattern;

diff --git a/lib/TransferOptions/UploadDirectoryOptions.cs b/lib/TransferOptions/UploadDirectoryOptions.cs
@@ -6,16 +6,40 @@
 namespace Microsoft.WindowsAzure.Storage.DataMovement
 {
     using Microsoft.WindowsAzure.Storage.Blob;
+    using Microsoft.WindowsAzure.Storage.DataMovement.Interop;
+    using System;
 
     /// <summary>
     /// Represents a set of options that may be specified for upload directory operation
     /// </summary>
     public sealed class UploadDirectoryOptions : DirectoryOptions
     {
+        private bool followSymlink = false;
         /// <summary>
         /// Gets or sets type of destination blob. This option takes effect only when uploading to Azure blob storage.
         /// If blob type is not specified, BlockBlob is used.
         /// </summary>
         public BlobType BlobType { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether to follow symlinked directories. This option only works in Unix/Linux platforms.
+        /// </summary>
+        public bool FollowSymlink
+        {
+            get
+            {
+                return this.followSymlink;
+            }
+
+            set
+            {
+                if (value && !CrossPlatformHelpers.IsLinux)
+                {
+                    throw new PlatformNotSupportedException();
+                }
+
+                this.followSymlink = value;
+            }
+        }
     }
 }
diff --git a/...soft.WindowsAzure.Storage.DataMovement/Microsoft.WindowsAzure.Storage.DataMovement.csproj b/...soft.WindowsAzure.Storage.DataMovement/Microsoft.WindowsAzure.Storage.DataMovement.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Microsoft.WindowsAzure.Storage.DataMovement Class Library</Description>
-    <Version>0.6.6.0</Version>
+    <Version>0.7.0.0</Version>
     <Authors>Microsoft</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -25,10 +25,16 @@
 
   <ItemGroup>
     <Compile Include="..\..\lib\**\*.cs;..\..\tools\AssemblyInfo\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="..\..\lib\Resources.resx" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="..\..\lib\Resources.resx" Link="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0-beta2" />
     <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
     <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.6.0" />

diff --git a/tools/AssemblyInfo/SharedAssemblyInfo.cs b/tools/AssemblyInfo/SharedAssemblyInfo.cs
@@ -12,8 +12,8 @@
 using System.Resources;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.6.6.0")]
-[assembly: AssemblyFileVersion("0.6.6.0")]
+[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyFileVersion("0.7.0.0")]
 
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Microsoft Azure Storage")]

diff --git a/tools/nupkg/Microsoft.Azure.Storage.DataMovement.nuspec b/tools/nupkg/Microsoft.Azure.Storage.DataMovement.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>Microsoft.Azure.Storage.DataMovement</id>
-    <version>0.6.6</version>
+    <version>0.7.0</version>
     <title>Microsoft Azure Storage Data Movement Library</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
@@ -22,6 +22,7 @@
         <dependency id="WindowsAzure.Storage" version="8.6.0" />
       </group>
       <group targetFramework="netstandard2.0">
+        <dependency id="Mono.Posix.NETStandard" version="1.0.0-beta2" />
         <dependency id="NETStandard.Library" version="1.6.0" />
         <dependency id="WindowsAzure.Storage" version="8.6.0" />
         <dependency id="System.Dynamic.Runtime" version="4.3.0" />