Add new APIs to IWriteableVirtualPathProvider, add impl in InMemoryVPP

mythz · mythz · commit e7680cf83dd4 · 2015-10-22T22:04:52.000-07:00
diff --git a/src/ServiceStack/ServiceStack.csproj b/src/ServiceStack/ServiceStack.csproj
@@ -467,6 +467,7 @@
     <Compile Include="VirtualPath\FileSystemVirtualFile.cs" />
     <Compile Include="VirtualPath\FileSystemVirtualPathProvider.cs" />
     <Compile Include="VirtualPath\InMemoryVirtualPathProvider.cs" />
+    <Compile Include="VirtualPath\IWriteableVirtualPathProvider.cs" />
     <Compile Include="VirtualPath\MultiVirtualPathProvider.cs" />
     <Compile Include="VirtualPath\ResourceVirtualDirectory.cs" />
     <Compile Include="VirtualPath\ResourceVirtualFile.cs" />
diff --git a/src/ServiceStack/VirtualPath/AbstractVirtualFileBase.cs b/src/ServiceStack/VirtualPath/AbstractVirtualFileBase.cs
@@ -59,6 +59,14 @@ public virtual string ReadAllText()
             }
         }
 
+        public virtual byte[] ReadAllBytes()
+        {
+            using (var stream = OpenRead())
+            {
+                return stream.ReadFully();
+            }
+        }
+
         public abstract Stream OpenRead();
 
         protected virtual String GetVirtualPathToRoot()
diff --git a/src/ServiceStack/VirtualPath/IWriteableVirtualPathProvider.cs b/src/ServiceStack/VirtualPath/IWriteableVirtualPathProvider.cs
@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using ServiceStack.IO;
+
+namespace ServiceStack.VirtualPath
+{
+    public interface IWriteableVirtualPathProvider
+    {
+        void AddFile(string filePath, string textContents);
+
+        void AddFile(string filePath, Stream stream);
+    }
+
+    public static class WriteableVirtualPathProviderExtensions
+    {
+        public static void AddFile(this IVirtualPathProvider pathProvider, string filePath, string textContents)
+        {
+            var writable = pathProvider as IWriteableVirtualPathProvider;
+            if (writable == null)
+                throw new InvalidOperationException("{0} does not implement IWriteableVirtualPathProvider"
+                    .Fmt(pathProvider.GetType().Name));
+
+            writable.AddFile(filePath, textContents);
+        }
+
+        public static void AddFile(this IVirtualPathProvider pathProvider, string filePath, Stream stream)
+        {
+            var writable = pathProvider as IWriteableVirtualPathProvider;
+            if (writable == null)
+                throw new InvalidOperationException("{0} does not implement IWriteableVirtualPathProvider"
+                    .Fmt(pathProvider.GetType().Name));
+
+            writable.AddFile(filePath, stream);
+        }
+    }
+}
diff --git a/src/ServiceStack/VirtualPath/InMemoryVirtualPathProvider.cs b/src/ServiceStack/VirtualPath/InMemoryVirtualPathProvider.cs
@@ -7,11 +7,6 @@
 
 namespace ServiceStack.VirtualPath
 {
-    public interface IWriteableVirtualPathProvider
-    {
-        void AddFile(string filePath, string contents);
-    }
-
     /// <summary>
     /// In Memory repository for files. Useful for testing.
     /// </summary>
@@ -44,16 +39,21 @@ protected override void Initialize()
         {
         }
 
-        public void AddFile(string filePath, string contents)
-        {
-            rootDirectory.AddFile(filePath, contents);
-        }
-
         public override IVirtualFile GetFile(string virtualPath)
         {
             return rootDirectory.GetFile(virtualPath)
                 ?? base.GetFile(virtualPath);
         }
+
+        public void AddFile(string filePath, string textContents)
+        {
+            rootDirectory.AddFile(filePath, textContents);
+        }
+
+        public void AddFile(string filePath, Stream stream)
+        {
+            rootDirectory.AddFile(filePath, stream);
+        }
     }
 
     public class InMemoryVirtualDirectory : AbstractVirtualDirectoryBase
@@ -134,20 +134,32 @@ protected override IVirtualDirectory GetDirectoryFromBackingDirectoryOrDefault(s
             return null;
         }
 
-        static readonly char[] DirSeps = new[] { '\\', '/' };
         public void AddFile(string filePath, string contents)
         {
             filePath = StripBeginningDirectorySeparator(filePath);
-            this.files.Add(new InMemoryVirtualFile(VirtualPathProvider, this) {
+            this.files.Add(new InMemoryVirtualFile(VirtualPathProvider, this)
+            {
                 FilePath = filePath,
                 FileName = filePath.Split(DirSeps).Last(),
                 TextContents = contents,
             });
         }
 
+        public void AddFile(string filePath, Stream stream)
+        {
+            filePath = StripBeginningDirectorySeparator(filePath);
+            this.files.Add(new InMemoryVirtualFile(VirtualPathProvider, this)
+            {
+                FilePath = filePath,
+                FileName = filePath.Split(DirSeps).Last(),
+                ByteContents = stream.ReadFully(),
+            });
+        }
+
+        static readonly char[] DirSeps = new[] { '\\', '/' };
         private static string StripBeginningDirectorySeparator(string filePath)
         {
-            if (String.IsNullOrEmpty(filePath))
+            if (string.IsNullOrEmpty(filePath))
                 return filePath;
 
             if (DirSeps.Any(d => filePath[0] == d))

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,14 @@ public virtual string ReadAllText()`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public virtual byte[] ReadAllBytes()`
	`63`	`+ {`
	`64`	`+ using (var stream = OpenRead())`
	`65`	`+ {`
	`66`	`+ return stream.ReadFully();`
	`67`	`+ }`
	`68`	`+ }`
	`69`	`+`
`62`	`70`	`public abstract Stream OpenRead();`
`63`	`71`
`64`	`72`	`protected virtual String GetVirtualPathToRoot()`