Merge pull request #8 from geeklearningio/master

Master

Author: asiffermann

README.md

@@ -2,7 +2,6 @@
 [![NuGet Version](http://img.shields.io/nuget/v/GeekLearning.Storage.FileSystem.svg?style=flat-square&label=nuget:%20filesystem)](https://www.nuget.org/packages/GeekLearning.Storage.FileSystem/)
 [![NuGet Version](http://img.shields.io/nuget/v/GeekLearning.Storage.Azure.svg?style=flat-square&label=nuget:%20azure%20 storage)](https://www.nuget.org/packages/GeekLearning.Storage.Azure/)
 [![Build Status](https://geeklearning.visualstudio.com/_apis/public/build/definitions/f841b266-7595-4d01-9ee1-4864cf65aa73/5/badge)](#)
-# gl-dotnet-storage
 
 # gl-dotnet-storage
 

src/GeekLearning.Storage.Azure/AzureStore.cs

@@ -1,21 +1,20 @@
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace GeekLearning.Storage.Azure
+namespace GeekLearning.Storage.Azure
 {
+    using Microsoft.WindowsAzure.Storage;
+    using Microsoft.WindowsAzure.Storage.Blob;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     public class AzureStore : IStore
     {
         private string connectionString;
         private Lazy<CloudBlobContainer> container;
         private Lazy<CloudBlobClient> client;
         private string containerName;
 
-
         public AzureStore(string connectionString, string containerName)
         {
             if (string.IsNullOrWhiteSpace(connectionString))
@@ -54,13 +53,13 @@ private Task<ICloudBlob> GetBlobReference(string path)
             if (uri.IsAbsoluteUri)
             {
                 return this.client.Value.GetBlobReferenceFromServerAsync(uri);
-            } else
+            }
+            else
             {
                 return this.container.Value.GetBlobReferenceFromServerAsync(path);
             }
         }
 
-
         public async Task<Stream> Read(string path)
         {
             return await this.ReadInMemory(path);
@@ -78,7 +77,7 @@ public async Task<string> ReadAllText(string path)
             using (var reader = new StreamReader(await blockBlob.OpenReadAsync(AccessCondition.GenerateEmptyCondition(), new BlobRequestOptions(), new OperationContext())))
             {
                 return await reader.ReadToEndAsync();
-            };
+            }
         }
 
         public async Task<string> Save(Stream data, string path, string mimeType)
@@ -103,6 +102,11 @@ public async Task<string> Save(byte[] data, string path, string mimeType)
 
         public async Task<string[]> List(string path)
         {
+            if (path.EndsWith("*"))
+            {
+                path = path.TrimEnd('*');
+            }
+
             BlobContinuationToken continuationToken = null;
             List<IListBlobItem> results = new List<IListBlobItem>();
             do
@@ -112,6 +116,7 @@ public async Task<string[]> List(string path)
                 results.AddRange(response.Results);
             }
             while (continuationToken != null);
+
             return results.Select(blob => blob.Uri.ToString()).ToArray();
         }
 

src/GeekLearning.Storage.Azure/project.json

@@ -1,7 +1,7 @@
 {
   "version": "0.0.1-*",
   "description": "GeekLearning.Storage.Azure Class Library",
-  "authors": [ "autex" ],
+  "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
   "packOptions": {
     "tags": [ ],
     "projectUrl": "",

src/GeekLearning.Storage.FileSystem/FileSystemStore.cs

@@ -1,21 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace GeekLearning.Storage.FileSystem
+namespace GeekLearning.Storage.FileSystem
 {
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     public class FileSystemStore : IStore
     {
         private string absolutePath;
+
         public FileSystemStore(string path, string appPath)
         {
             if (string.IsNullOrEmpty(path))
             {
                 throw new ArgumentNullException("path");
             }
-            if (System.IO.Path.IsPathRooted(path))
+
+            if (Path.IsPathRooted(path))
             {
                 this.absolutePath = path;
             }
@@ -41,9 +42,10 @@ public Task<string[]> List(string path)
             var directoryPath = Path.GetDirectoryName(Path.Combine(this.absolutePath, path));
             if (!Directory.Exists(directoryPath))
             {
-                return Task.FromResult(new string[0]); 
+                return Task.FromResult(new string[0]);
             }
-            return Task.FromResult(Directory.GetFiles(directoryPath).Select(x => x.Replace(this.absolutePath, "")).ToArray());
+
+            return Task.FromResult(Directory.GetFiles(directoryPath).Select(x => x.Replace(this.absolutePath, "").Trim('/', '\\')).ToArray());
         }
 
         public Task<Stream> Read(string path)
@@ -68,6 +70,7 @@ public async Task<string> Save(Stream data, string path, string mimeType)
             {
                 await data.CopyToAsync(file);
             }
+
             return path;
         }
 

src/GeekLearning.Storage.FileSystem/project.json

@@ -1,7 +1,7 @@
 {
   "version": "0.0.1-*",
   "description": "GeekLearning.Storage.FileSystem Class Library",
-  "authors": [ "autex" ],
+  "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
   "packOptions": {
     "tags": [ ],
     "projectUrl": "",

src/GeekLearning.Storage/project.json

@@ -1,7 +1,7 @@
 {
   "version": "0.0.1-*",
   "description": "GeekLearning.Storage Class Library",
-  "authors": [ "autex" ],
+  "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
   "packOptions": {
     "tags": [ ],
     "projectUrl": "",