Starting to refactor and introduce a blob storage repository

JakeGinnivan · JakeGinnivan · commit 309023137f5c · 2012-06-27T15:21:41.000+08:00
--HG--
branch : azure-storage
diff --git a/src/FunnelWeb.Azure/ServiceConfiguration.Cloud.cscfg b/src/FunnelWeb.Azure/ServiceConfiguration.Cloud.cscfg
@@ -8,6 +8,7 @@
       <Setting name="funnelweb.configuration.authentication.username" value="test" />
       <Setting name="funnelweb.configuration.authentication.password" value="test" />
       <Setting name="funnelweb.configuration.database.provider" value="sql" />
+      <Setting name="StorageConnectionString" value="" />
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/src/FunnelWeb.Azure/ServiceConfiguration.Local.cscfg b/src/FunnelWeb.Azure/ServiceConfiguration.Local.cscfg
@@ -8,6 +8,7 @@
       <Setting name="funnelweb.configuration.authentication.username" value="test" />
       <Setting name="funnelweb.configuration.authentication.password" value="test" />
       <Setting name="funnelweb.configuration.database.provider" value="sql" />
+      <Setting name="StorageConnectionString" value="UseDevelopmentStorage=true" />
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/src/FunnelWeb.Azure/ServiceDefinition.build.csdef b/src/FunnelWeb.Azure/ServiceDefinition.build.csdef
@@ -27,6 +27,8 @@
       <Setting name="funnelweb.configuration.authentication.username" />
       <Setting name="funnelweb.configuration.authentication.password" />
       <Setting name="funnelweb.configuration.database.provider" />
+      <Setting name="StorageConnectionString" />
     </ConfigurationSettings>
+    <LocalResources></LocalResources>
   </WebRole>
 </ServiceDefinition>
diff --git a/src/FunnelWeb.Azure/ServiceDefinition.csdef b/src/FunnelWeb.Azure/ServiceDefinition.csdef
@@ -19,6 +19,9 @@
       <Setting name="funnelweb.configuration.authentication.username" />
       <Setting name="funnelweb.configuration.authentication.password" />
       <Setting name="funnelweb.configuration.database.provider" />
+      <Setting name="StorageConnectionString" />
     </ConfigurationSettings>
+    <LocalResources>
+    </LocalResources>
   </WebRole>
 </ServiceDefinition>
diff --git a/src/FunnelWeb.Tests/Core/Repositories/FileRepositoryTests.cs b/src/FunnelWeb.Tests/Core/Repositories/FileRepositoryTests.cs
@@ -2,13 +2,21 @@
 using System.Web;
 using FunnelWeb.Model.Repositories.Internal;
 using FunnelWeb.Settings;
+using FunnelWeb.Utilities;
 using NSubstitute;
 using NUnit.Framework;
 
 namespace FunnelWeb.Tests.Core.Repositories
 {
     public class FileRepositoryTests
     {
+        private readonly IMimeTypeLookup mimeTypeLookup;
+
+        public FileRepositoryTests()
+        {
+            mimeTypeLookup = Substitute.For<IMimeTypeLookup>();
+        }
+
         [Test]
         public void RelativePaths()
         {
@@ -18,7 +26,7 @@ public void RelativePaths()
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "~/Temp" });
 
-            new FileRepository(settings, server);
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 
@@ -34,7 +42,7 @@ public void AbsolutePaths()
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "C:\\Temp" });
             
-            new FileRepository(settings, server);
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 
diff --git a/src/FunnelWeb.Tests/Helpers/SqlCeTemporaryDatabase.cs b/src/FunnelWeb.Tests/Helpers/SqlCeTemporaryDatabase.cs
@@ -90,6 +90,8 @@ public string Schema
             set { }
         }
 
+        public string ReadOnlyReason { get; set; }
+
         public AdHocSqlRunner AdHoc
         {
             get { return database; }
diff --git a/src/FunnelWeb.Tests/LifetimeJustifications.cs b/src/FunnelWeb.Tests/LifetimeJustifications.cs
@@ -16,6 +16,7 @@
 using FunnelWeb.Repositories;
 using FunnelWeb.Settings;
 using FunnelWeb.Tasks;
+using FunnelWeb.Utilities;
 using FunnelWeb.Web.Application.Authentication;
 using FunnelWeb.Web.Application.Mime;
 using FunnelWeb.Web.Application.Mvc;
diff --git a/src/FunnelWeb.Tests/Web/Areas/Admin/Controllers/UploadControllerTests.cs b/src/FunnelWeb.Tests/Web/Areas/Admin/Controllers/UploadControllerTests.cs
@@ -3,7 +3,7 @@
 using System.Web.Mvc;
 using FunnelWeb.Model.Repositories;
 using FunnelWeb.Tests.Web.Controllers;
-using FunnelWeb.Web.Application.Mime;
+using FunnelWeb.Utilities;
 using FunnelWeb.Web.Application.Mvc;
 using FunnelWeb.Web.Areas.Admin.Controllers;
 using NSubstitute;
@@ -61,11 +61,8 @@ public void Upload()
 
             var upload = new FileUpload(file);
 
-            FileRepository.MapPath(Arg.Any<string>()).Returns("path");
-            
             var result = (RedirectToRouteResult)Controller.Upload("path", false, upload);
 
-            FileRepository.Received().MapPath(Arg.Is("path"));
             FileRepository.Received().Save(Arg.Is<Stream>(stream), Arg.Is("path"), Arg.Is(false));
 
             Assert.That(result.RouteValues["Action"], Is.EqualTo("Index"));
@@ -81,11 +78,8 @@ public void UploadAndUnzip()
 
             var upload = new FileUpload(file);
 
-            FileRepository.MapPath(Arg.Any<string>()).Returns("path");
-
             var result = (RedirectToRouteResult)Controller.Upload("path", true, upload);
 
-            FileRepository.Received().MapPath(Arg.Is("path"));
             FileRepository.Received().Save(Arg.Is<Stream>(stream), Arg.Is("path"), Arg.Is(true));
 
             Assert.That(result.RouteValues["Action"], Is.EqualTo("Index"));
@@ -115,7 +109,6 @@ public void Delete()
         public void RenderExistingFile()
         {
             FileRepository.IsFile(Arg.Is("file")).Returns(true);
-            FileRepository.MapPath(Arg.Is("file")).Returns("file");
 
             MimeTypeLookup.GetMimeType(Arg.Any<string>()).Returns("mime-type");
 
@@ -136,7 +129,6 @@ public void Return404OnMissingFile()
             var result = Controller.Render("file");
 
             FileRepository.Received().IsFile(Arg.Is("file"));
-            FileRepository.DidNotReceive().MapPath(Arg.Any<string>());
             MimeTypeLookup.DidNotReceive().GetMimeType(Arg.Any<string>());
 
             Assert.IsInstanceOf(typeof (HttpNotFoundResult), result);
diff --git a/src/FunnelWeb.Tests/Web/Model/Repositories/FileRepositoryTests.cs b/src/FunnelWeb.Tests/Web/Model/Repositories/FileRepositoryTests.cs
@@ -1,28 +1,36 @@
 ﻿using System.Web;
 using FunnelWeb.Model.Repositories.Internal;
 using FunnelWeb.Settings;
+using FunnelWeb.Utilities;
 using NSubstitute;
 using NUnit.Framework;
 
 namespace FunnelWeb.Tests.Web.Model.Repositories
 {
     public class FileRepositoryTests
     {
+        private readonly IMimeTypeLookup mimeTypeLookup;
+
+        public FileRepositoryTests()
+        {
+            mimeTypeLookup = Substitute.For<IMimeTypeLookup>();
+        }
+
         [Test]
         public void RelativePaths()
         {
             //Arrange
             var server = Substitute.For<HttpServerUtilityBase>();
-            server.MapPath(Arg.Is<string>("~/Temp")).Returns("C:\\Temp");
+            server.MapPath(Arg.Is("~/Temp")).Returns("C:\\Temp");
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "~/Temp" });
 
-            var fileRepo = new FileRepository(settings, server);
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 
             //Assert
-            server.Received().MapPath(Arg.Is<string>("~/Temp"));
+            server.Received().MapPath(Arg.Is("~/Temp"));
         }
 
         [Test]
@@ -32,8 +40,8 @@ public void AbsolutePaths()
             var server = Substitute.For<HttpServerUtilityBase>();
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "C:\\Temp" });
-            
-            var fileRepo = new FileRepository(settings, server);
+
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 
diff --git a/src/FunnelWeb.Web/Application/MetaWeblog/MetaWeblog.cs b/src/FunnelWeb.Web/Application/MetaWeblog/MetaWeblog.cs
@@ -214,11 +214,10 @@ public MediaObjectInfo NewMediaObject(string blogid, string username, string pas
                 using (var memoryStream = new MemoryStream(mediaObject.bits))
                 {
                     var fileName = Path.GetFileNameWithoutExtension(mediaObject.name) + "_" + DateTime.Now.Ticks + Path.GetExtension(mediaObject.name);
-                    var fullPath = fileRepository.MapPath(fileName);
 
                     objectInfo.url = VirtualPathUtility.ToAbsolute(funnelWebSettings.UploadPath + "/" + fileName);
 
-                    fileRepository.Save(memoryStream, fullPath, false);
+                    fileRepository.Save(memoryStream, fileName, false);
                 }
 
                 return objectInfo;
diff --git a/src/FunnelWeb.Web/Application/Mime/MimeSupportModule.cs b/src/FunnelWeb.Web/Application/Mime/MimeSupportModule.cs
@@ -1,4 +1,5 @@
 ﻿using Autofac;
+using FunnelWeb.Utilities;
 
 namespace FunnelWeb.Web.Application.Mime
 {
diff --git a/src/FunnelWeb.Web/Application/Mime/RegistryMimeTypeLookup.cs b/src/FunnelWeb.Web/Application/Mime/RegistryMimeTypeLookup.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using FunnelWeb.Utilities;
 using Microsoft.Win32;
 
 namespace FunnelWeb.Web.Application.Mime
diff --git a/src/FunnelWeb.Web/Areas/Admin/Controllers/InstallController.cs b/src/FunnelWeb.Web/Areas/Admin/Controllers/InstallController.cs
@@ -34,16 +34,18 @@ public virtual ActionResult Index()
             var databaseProvider = databaseProviderList.Single(p => p.Metadata.Name.Equals(databaseProviderName, StringComparison.InvariantCultureIgnoreCase));
 
             string error;
-            var model = new IndexModel();
-            model.DatabaseProviders = databaseProviderList.Select(p => p.Metadata.Name);
-            model.DatabaseProvider = databaseProviderName;
-            model.CanConnect = databaseProvider.Value.TryConnect(connectionString, out error);
-            model.ConnectionError = error;
-            model.ConnectionString = connectionString;
-            model.Schema = databaseProvider.Value.SupportSchema ? schema : null;
-            model.DatabaseProviderSupportsSchema = databaseProvider.Value.SupportSchema;
-            model.IsSettingsReadOnly = ConnectionStringProvider.ReadOnlyReason != null;
-            model.ReadOnlyReason = ConnectionStringProvider.ReadOnlyReason;
+            var model = new IndexModel
+                            {
+                                DatabaseProviders = databaseProviderList.Select(p => p.Metadata.Name),
+                                DatabaseProvider = databaseProviderName,
+                                CanConnect = databaseProvider.Value.TryConnect(connectionString, out error),
+                                ConnectionError = error,
+                                ConnectionString = connectionString,
+                                Schema = databaseProvider.Value.SupportSchema ? schema : null,
+                                DatabaseProviderSupportsSchema = databaseProvider.Value.SupportSchema,
+                                IsSettingsReadOnly = ConnectionStringProvider.ReadOnlyReason != null,
+                                ReadOnlyReason = ConnectionStringProvider.ReadOnlyReason
+                            };
 
             if (model.CanConnect)
             {
diff --git a/src/FunnelWeb.Web/Areas/Admin/Controllers/UploadController.cs b/src/FunnelWeb.Web/Areas/Admin/Controllers/UploadController.cs
@@ -1,6 +1,7 @@
 ﻿using System.IO;
 using System.Web.Mvc;
 using FunnelWeb.Model.Repositories;
+using FunnelWeb.Utilities;
 using FunnelWeb.Web.Application.Mime;
 using FunnelWeb.Web.Application.Mvc;
 using FunnelWeb.Web.Areas.Admin.Views.Upload;
@@ -29,8 +30,8 @@ public virtual ActionResult Index(string path)
         [Authorize(Roles = "Moderator")]
         public virtual ActionResult Upload(string path, bool? unzip, FileUpload upload)
         {
-            string fullPath = FileRepository.MapPath(Path.Combine(path, upload.FileName));
-            FileRepository.Save(upload.Stream, fullPath, unzip ?? false);
+            var filePath = Path.Combine(path, upload.FileName);
+            FileRepository.Save(upload.Stream, filePath, unzip ?? false);
             return RedirectToAction("Index", "Upload", new {path});
         }
 
@@ -57,13 +58,7 @@ public virtual ActionResult Delete(string path, string filePath)
 
         public virtual ActionResult Render(string path)
         {
-            if (FileRepository.IsFile(path))
-            {
-                var fullPath = FileRepository.MapPath(path);
-
-                return File(fullPath, MimeHelper.GetMimeType(fullPath));
-            }
-            return HttpNotFound();
+            return FileRepository.Render(path);
         }
     }
 }
diff --git a/src/FunnelWeb.Web/FunnelWeb.Web.csproj b/src/FunnelWeb.Web/FunnelWeb.Web.csproj
@@ -210,7 +210,6 @@
     <Compile Include="Application\Themes\ThemesModule.cs" />
     <Compile Include="Application\Markup\InputSanitizer.cs" />
     <Compile Include="Application\Markup\MarkdownNetByBrianJeremy.cs" />
-    <Compile Include="Application\Mime\IMimeTypeLookup.cs" />
     <Compile Include="Application\Mime\RegistryMimeTypeLookup.cs" />
     <Compile Include="Application\Authentication\AuthenticationModule.cs" />
     <Compile Include="Application\Mvc\Binders\BindersModule.cs" />
diff --git a/src/FunnelWeb/FunnelWeb.csproj b/src/FunnelWeb/FunnelWeb.csproj
@@ -61,7 +61,13 @@
     <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.7.0.1\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAzure.Storage.1.7.0.0\lib\net35-full\Microsoft.WindowsAzure.StorageClient.dll</HintPath>
+    </Reference>
     <Reference Include="MiniProfiler">
       <HintPath>..\packages\MiniProfiler.2.0.1\lib\net40\MiniProfiler.dll</HintPath>
     </Reference>
@@ -80,6 +86,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.Services.Client" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\SqlServerCompact.4.0.8482.1\lib\System.Data.SqlServerCe.dll</HintPath>
@@ -136,7 +143,10 @@
     <Compile Include="Filters\FunnelWebRequestAttribute.cs" />
     <Compile Include="FunnelWebExtensionAttribute.cs" />
     <Compile Include="FunnelWebExtensionLoadException.asax.cs" />
+    <Compile Include="Model\Repositories\Internal\AzureBlobFileRepository.cs" />
+    <Compile Include="Model\Repositories\Internal\FileRepositoryBase.cs" />
     <Compile Include="Settings\BootstrapSettingsAdapter.cs" />
+    <Compile Include="Utilities\IMimeTypeLookup.cs" />
     <Compile Include="Utilities\StringExtensions.cs" />
     <Compile Include="Settings\AppHarborSettings.cs" />
     <Compile Include="Settings\IAppHarborSettings.cs" />
diff --git a/src/FunnelWeb/Model/Repositories/IFileRepository.cs b/src/FunnelWeb/Model/Repositories/IFileRepository.cs
@@ -1,20 +1,18 @@
 using System.IO;
+using System.Web.Mvc;
 
 namespace FunnelWeb.Model.Repositories
 {
     public interface IFileRepository
     {
-        string MapPath(string path);
-        string UnmapPath(string fullPath);
         bool IsFile(string path);
         FileItem[] GetItems(string path);
-        DirectoryInfo[] GetDirectories(string path);
-        FileInfo[] GetFiles(string path);
 
         void Move(string oldPath, string newPath);
         void Delete(string filePath);
 
         void CreateDirectory(string path, string name);
-        void Save(Stream inputStream, string fullPath, bool unzip);
+        void Save(Stream inputStream, string path, bool unzip);
+        ActionResult Render(string path);
     }
 }
diff --git a/src/FunnelWeb/Model/Repositories/Internal/AzureBlobFileRepository.cs b/src/FunnelWeb/Model/Repositories/Internal/AzureBlobFileRepository.cs
diff --git a/src/FunnelWeb/Model/Repositories/Internal/FileRepository.cs b/src/FunnelWeb/Model/Repositories/Internal/FileRepository.cs
diff --git a/src/FunnelWeb/Model/Repositories/Internal/FileRepositoryBase.cs b/src/FunnelWeb/Model/Repositories/Internal/FileRepositoryBase.cs
diff --git a/src/FunnelWeb/Model/Repositories/RepositoriesModule.cs b/src/FunnelWeb/Model/Repositories/RepositoriesModule.cs
diff --git a/src/FunnelWeb/Utilities/IMimeTypeLookup.cs b/src/FunnelWeb/Utilities/IMimeTypeLookup.cs
diff --git a/src/FunnelWeb/packages.config b/src/FunnelWeb/packages.config

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ public string Schema`
`90`	`90`	`set { }`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ public string ReadOnlyReason { get; set; }`
	`94`	`+`
`93`	`95`	`public AdHocSqlRunner AdHoc`
`94`	`96`	`{`
`95`	`97`	`get { return database; }`
Original file line number	Diff line number	Diff line change
`@@ -214,11 +214,10 @@ public MediaObjectInfo NewMediaObject(string blogid, string username, string pas`
`214`	`214`	`using (var memoryStream = new MemoryStream(mediaObject.bits))`
`215`	`215`	`{`
`216`	`216`	`var fileName = Path.GetFileNameWithoutExtension(mediaObject.name) + "_" + DateTime.Now.Ticks + Path.GetExtension(mediaObject.name);`
`217`		`- var fullPath = fileRepository.MapPath(fileName);`
`218`	`217`
`219`	`218`	`objectInfo.url = VirtualPathUtility.ToAbsolute(funnelWebSettings.UploadPath + "/" + fileName);`
`220`	`219`
`221`		`- fileRepository.Save(memoryStream, fullPath, false);`
	`220`	`+ fileRepository.Save(memoryStream, fileName, false);`
`222`	`221`	`}`
`223`	`222`
`224`	`223`	`return objectInfo;`