new tests

sandorfr · sandorfr · commit 690bc1c442c9 · 2016-07-05T16:26:27.000+02:00
basic globbing support
diff --git a/src/GeekLearning.Storage.Azure/AzureStore.cs b/src/GeekLearning.Storage.Azure/AzureStore.cs
@@ -147,10 +147,23 @@ public async Task<IFileReference[]> ListAsync(string path, bool recursive)
 
         public async Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive)
         {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                path = null;
+            }
+            else
+            {
+                if (!path.EndsWith("/"))
+                {
+                    path = path + "/";
+                }
+            }
+
+            string prefix = path;
             var firstWildCard = searchPattern.IndexOf('*');
             if (firstWildCard >= 0)
             {
-                path += searchPattern.Substring(0, firstWildCard);
+                prefix += searchPattern.Substring(0, firstWildCard);
                 searchPattern = searchPattern.Substring(firstWildCard);
             }
 
@@ -162,19 +175,19 @@ public async Task<IFileReference[]> ListAsync(string path, string searchPattern,
             List<IListBlobItem> results = new List<IListBlobItem>();
             do
             {
-                var response = await this.container.Value.ListBlobsSegmentedAsync(path, recursive, BlobListingDetails.None, null, continuationToken, new BlobRequestOptions(), new OperationContext());
+                var response = await this.container.Value.ListBlobsSegmentedAsync(prefix, recursive, BlobListingDetails.None, null, continuationToken, new BlobRequestOptions(), new OperationContext());
                 continuationToken = response.ContinuationToken;
                 results.AddRange(response.Results);
             }
             while (continuationToken != null);
 
-            var pathMap = results.Select(blob => new Internal.AzureFileReference(blob)).ToDictionary(x => x.Path);
-            throw new NotSupportedException();
-            //var filteredResults = matcher.Execute(
-            //    new Internal.AzureListDirectoryWrapper(path,
-            //    pathMap.Values));
+            var pathMap = results.OfType<ICloudBlob>().Select(blob => new Internal.AzureFileReference(blob)).ToDictionary(x => x.Path);
+
+            var filteredResults = matcher.Execute(
+                new Internal.AzureListDirectoryWrapper(path,
+                pathMap));
 
-            //return filteredResults.Files.Select(x => pathMap[x.Path]).ToArray();
+            return filteredResults.Files.Select(x => pathMap[path + x.Path]).ToArray();
         }
 
         public async Task DeleteAsync(IPrivateFileReference file)
diff --git a/src/GeekLearning.Storage.Azure/Internal/AzureListDirectoryWrapper.cs b/src/GeekLearning.Storage.Azure/Internal/AzureListDirectoryWrapper.cs
@@ -9,14 +9,33 @@ namespace GeekLearning.Storage.Azure.Internal
 {
     public class AzureListDirectoryWrapper : DirectoryInfoBase
     {
+        private string name;
         private string fullName;
+        private string path;
+        private Dictionary<string, AzureFileReference> files;
 
         public AzureListDirectoryWrapper(FileSystemInfoBase childrens)
         {
             this.fullName = "root";
             this.ParentDirectory = null;
         }
 
+        public AzureListDirectoryWrapper(string path, Dictionary<string, AzureFileReference> files)
+        {
+            this.path = path;
+            this.files = files;
+            this.fullName = path;
+            var lastSlash = path.LastIndexOf('/');
+            if (lastSlash >= 0)
+            {
+                this.name = path.Substring(lastSlash + 1);
+            }
+            else
+            {
+                this.name = path;
+            }
+        }
+
         public AzureListDirectoryWrapper(CloudBlobDirectory blobDirectory, AzureListDirectoryWrapper parent = null)
         {
             this.ParentDirectory = parent;
@@ -35,7 +54,7 @@ public override string Name
         {
             get
             {
-                return fullName;
+                return name;
             }
         }
 
@@ -46,7 +65,7 @@ public override DirectoryInfoBase ParentDirectory
 
         public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos()
         {
-            throw new NotImplementedException();
+            return this.files.Values.Select(file => new AzureListFileWrapper(file.CloudBlob, this));
         }
 
         public override DirectoryInfoBase GetDirectory(string path)
@@ -56,7 +75,7 @@ public override DirectoryInfoBase GetDirectory(string path)
 
         public override FileInfoBase GetFile(string path)
         {
-            throw new NotImplementedException();
+            return new AzureListFileWrapper(this.files[path].CloudBlob, this);
         }
     }
 }
diff --git a/src/GeekLearning.Storage.Azure/Internal/AzureListFileWrapper.cs b/src/GeekLearning.Storage.Azure/Internal/AzureListFileWrapper.cs
@@ -9,11 +9,23 @@ namespace GeekLearning.Storage.Azure.Internal
 {
     public class AzureListFileWrapper : FileInfoBase
     {
-        private CloudBlob blob;
+        private ICloudBlob blob;
+        private string name;
+        private AzureListDirectoryWrapper parent;
 
-        public AzureListFileWrapper(CloudBlob blob)
+        public AzureListFileWrapper(ICloudBlob blob, AzureListDirectoryWrapper parent)
         {
             this.blob = blob;
+            var lastSlash = blob.Name.LastIndexOf('/');
+            if (lastSlash >= 0)
+            {
+                this.name = blob.Name.Substring(lastSlash + 1);
+            }
+            else
+            {
+                this.name = blob.Name;
+            }
+            this.parent = parent;
         }
 
         public override string FullName
@@ -28,15 +40,15 @@ public override string Name
         {
             get
             {
-                return this.blob.Name;
+                return name;
             }
         }
 
         public override DirectoryInfoBase ParentDirectory
         {
             get
             {
-                throw new NotImplementedException();
+                return this.parent;
             }
         }
     }
diff --git a/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs b/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs
@@ -73,10 +73,10 @@ public Task<IFileReference[]> ListAsync(string path, string searchPattern, bool
             Microsoft.Extensions.FileSystemGlobbing.Matcher matcher = new Microsoft.Extensions.FileSystemGlobbing.Matcher(StringComparison.Ordinal);
             matcher.AddInclude(searchPattern);
 
-            var results = matcher.Execute(new Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper(new DirectoryInfo(path)));
+            var results = matcher.Execute(new Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper(new DirectoryInfo(directoryPath)));
 
             return Task.FromResult(results.Files
-                .Select(match => (IFileReference)new Internal.FileSystemFileReference(match.Path, match.Path.Replace(this.absolutePath, "").Trim('/', '\\')))
+                .Select(match => (IFileReference)new Internal.FileSystemFileReference(Path.Combine(directoryPath, match.Path), Path.Combine(path, match.Path).Trim('/', '\\')))
                 .ToArray());
         }
 
diff --git a/tests/GeekLearning.Integration.Test/ListTests.cs b/tests/GeekLearning.Integration.Test/ListTests.cs
@@ -94,5 +94,43 @@ public async Task ListSubDirectoryFilesWithTrailingSlash(string storeName)
             Assert.Empty(missingFiles);
             Assert.Empty(unexpectedFiles);
         }
+
+        [Theory(DisplayName = nameof(ExtensionGlobbing)), InlineData("azure"), InlineData("filesystem")]
+        public async Task ExtensionGlobbing(string storeName)
+        {
+            var storageFactory = this.storeFixture.Services.GetRequiredService<IStorageFactory>();
+
+            var store = storageFactory.GetStore(storeName);
+
+            var expected = new string[] { "Globbing/template.hbs", "Globbing/template-header.hbs" };
+
+            var results = await store.ListAsync("Globbing", "*.hbs");
+
+            var missingFiles = expected.Except(results.Select(f => f.Path)).ToArray();
+
+            var unexpectedFiles = results.Select(f => f.Path).Except(expected).ToArray();
+
+            Assert.Empty(missingFiles);
+            Assert.Empty(unexpectedFiles);
+        }
+
+        [Theory(DisplayName = nameof(FileNameGlobbing)), InlineData("azure"), InlineData("filesystem")]
+        public async Task FileNameGlobbing(string storeName)
+        {
+            var storageFactory = this.storeFixture.Services.GetRequiredService<IStorageFactory>();
+
+            var store = storageFactory.GetStore(storeName);
+
+            var expected = new string[] { "Globbing/template.hbs", "Globbing/template.mustache" };
+
+            var results = await store.ListAsync("Globbing", "template.*");
+
+            var missingFiles = expected.Except(results.Select(f => f.Path)).ToArray();
+
+            var unexpectedFiles = results.Select(f => f.Path).Except(expected).ToArray();
+
+            Assert.Empty(missingFiles);
+            Assert.Empty(unexpectedFiles);
+        }
     }
 }
diff --git a/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template-header.hbs b/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template-header.hbs
@@ -0,0 +1 @@
+﻿template.header.hbs
diff --git a/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template-header.mustache b/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template-header.mustache
@@ -0,0 +1 @@
+﻿template.header.mustache
diff --git a/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template.hbs b/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template.hbs
@@ -0,0 +1 @@
+﻿template.hbs
diff --git a/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template.mustache b/tests/GeekLearning.Integration.Test/SampleDirectory/Globbing/template.mustache
@@ -0,0 +1 @@
+﻿template.mustache

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,33 @@ namespace GeekLearning.Storage.Azure.Internal`
`9`	`9`	`{`
`10`	`10`	`public class AzureListDirectoryWrapper : DirectoryInfoBase`
`11`	`11`	`{`
	`12`	`+ private string name;`
`12`	`13`	`private string fullName;`
	`14`	`+ private string path;`
	`15`	`+ private Dictionary<string, AzureFileReference> files;`
`13`	`16`
`14`	`17`	`public AzureListDirectoryWrapper(FileSystemInfoBase childrens)`
`15`	`18`	`{`
`16`	`19`	`this.fullName = "root";`
`17`	`20`	`this.ParentDirectory = null;`
`18`	`21`	`}`
`19`	`22`
	`23`	`+ public AzureListDirectoryWrapper(string path, Dictionary<string, AzureFileReference> files)`
	`24`	`+ {`
	`25`	`+ this.path = path;`
	`26`	`+ this.files = files;`
	`27`	`+ this.fullName = path;`
	`28`	`+ var lastSlash = path.LastIndexOf('/');`
	`29`	`+ if (lastSlash >= 0)`
	`30`	`+ {`
	`31`	`+ this.name = path.Substring(lastSlash + 1);`
	`32`	`+ }`
	`33`	`+ else`
	`34`	`+ {`
	`35`	`+ this.name = path;`
	`36`	`+ }`
	`37`	`+ }`
	`38`	`+`
`20`	`39`	`public AzureListDirectoryWrapper(CloudBlobDirectory blobDirectory, AzureListDirectoryWrapper parent = null)`
`21`	`40`	`{`
`22`	`41`	`this.ParentDirectory = parent;`
`@@ -35,7 +54,7 @@ public override string Name`
`35`	`54`	`{`
`36`	`55`	`get`
`37`	`56`	`{`
`38`		`- return fullName;`
	`57`	`+ return name;`
`39`	`58`	`}`
`40`	`59`	`}`
`41`	`60`
`@@ -46,7 +65,7 @@ public override DirectoryInfoBase ParentDirectory`
`46`	`65`
`47`	`66`	`public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos()`
`48`	`67`	`{`
`49`		`- throw new NotImplementedException();`
	`68`	`+ return this.files.Values.Select(file => new AzureListFileWrapper(file.CloudBlob, this));`
`50`	`69`	`}`
`51`	`70`
`52`	`71`	`public override DirectoryInfoBase GetDirectory(string path)`
`@@ -56,7 +75,7 @@ public override DirectoryInfoBase GetDirectory(string path)`
`56`	`75`
`57`	`76`	`public override FileInfoBase GetFile(string path)`
`58`	`77`	`{`
`59`		`- throw new NotImplementedException();`
	`78`	`+ return new AzureListFileWrapper(this.files[path].CloudBlob, this);`
`60`	`79`	`}`
`61`	`80`	`}`
`62`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,23 @@ namespace GeekLearning.Storage.Azure.Internal`
`9`	`9`	`{`
`10`	`10`	`public class AzureListFileWrapper : FileInfoBase`
`11`	`11`	`{`
`12`		`- private CloudBlob blob;`
	`12`	`+ private ICloudBlob blob;`
	`13`	`+ private string name;`
	`14`	`+ private AzureListDirectoryWrapper parent;`
`13`	`15`
`14`		`- public AzureListFileWrapper(CloudBlob blob)`
	`16`	`+ public AzureListFileWrapper(ICloudBlob blob, AzureListDirectoryWrapper parent)`
`15`	`17`	`{`
`16`	`18`	`this.blob = blob;`
	`19`	`+ var lastSlash = blob.Name.LastIndexOf('/');`
	`20`	`+ if (lastSlash >= 0)`
	`21`	`+ {`
	`22`	`+ this.name = blob.Name.Substring(lastSlash + 1);`
	`23`	`+ }`
	`24`	`+ else`
	`25`	`+ {`
	`26`	`+ this.name = blob.Name;`
	`27`	`+ }`
	`28`	`+ this.parent = parent;`
`17`	`29`	`}`
`18`	`30`
`19`	`31`	`public override string FullName`
`@@ -28,15 +40,15 @@ public override string Name`
`28`	`40`	`{`
`29`	`41`	`get`
`30`	`42`	`{`
`31`		`- return this.blob.Name;`
	`43`	`+ return name;`
`32`	`44`	`}`
`33`	`45`	`}`
`34`	`46`
`35`	`47`	`public override DirectoryInfoBase ParentDirectory`
`36`	`48`	`{`
`37`	`49`	`get`
`38`	`50`	`{`
`39`		`- throw new NotImplementedException();`
	`51`	`+ return this.parent;`
`40`	`52`	`}`
`41`	`53`	`}`
`42`	`54`	`}`