From dfaab61f4374ea6fe837f924fae4c22de33e5802 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Sun, 18 Jul 2010 14:29:31 -0700
Subject: [PATCH] Expand packages to the "live" ~/Themes, ~/Modules folders

--HG--
branch : dev
---
 src/Orchard/Packaging/PackageBuilder.cs  |  2 +-
 src/Orchard/Packaging/PackageExpander.cs | 35 ++++++++++++++----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Orchard/Packaging/PackageBuilder.cs b/src/Orchard/Packaging/PackageBuilder.cs
index 4913cd945..4cb4b597b 100644
--- a/src/Orchard/Packaging/PackageBuilder.cs
+++ b/src/Orchard/Packaging/PackageBuilder.cs
@@ -39,7 +39,7 @@ namespace Orchard.Packaging {
 
                 var projectFile = extensionDescriptor.Name + ".csproj";
                 if (LoadProject(context, projectFile)) {
-                    EmbedVirtualFile(context, projectFile, System.Net.Mime.MediaTypeNames.Text.Xml);
+                    EmbedVirtualFile(context, projectFile, MediaTypeNames.Text.Xml);
                     EmbedProjectFiles(context, "Compile", "Content", "None", "EmbeddedResource");
                     EmbedReferenceFiles(context);
                 }
diff --git a/src/Orchard/Packaging/PackageExpander.cs b/src/Orchard/Packaging/PackageExpander.cs
index 90f4e5085..61051ae77 100644
--- a/src/Orchard/Packaging/PackageExpander.cs
+++ b/src/Orchard/Packaging/PackageExpander.cs
@@ -5,17 +5,21 @@ using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
 using Orchard.FileSystems.VirtualPath;
+using Orchard.Localization;
 
 namespace Orchard.Packaging {
     public class PackageExpander : IPackageExpander {
         private const string ContentTypePrefix = "Orchard ";
         private readonly IVirtualPathProvider _virtualPathProvider;
 
-        public PackageExpander(
-            IVirtualPathProvider virtualPathProvider) {
+        public PackageExpander(IVirtualPathProvider virtualPathProvider) {
             _virtualPathProvider = virtualPathProvider;
+
+            T = NullLocalizer.Instance;
         }
 
+        public Localizer T { get; set; }
+
         class ExpandContext {
             public Stream Stream { get; set; }
             public Package Package { get; set; }
@@ -61,12 +65,12 @@ namespace Orchard.Packaging {
             var partUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
             var packagePart = context.Package.GetPart(partUri);
             using (var packageStream = packagePart.GetStream(FileMode.Open, FileAccess.Read)) {
-                var filePath = Path.Combine(context.TargetPath, relativePath);
-                var folderPath = Path.GetDirectoryName(filePath);
-                if (!Directory.Exists(folderPath))
-                    Directory.CreateDirectory(folderPath);
+                var filePath = _virtualPathProvider.Combine(context.TargetPath, relativePath);
+                var folderPath = _virtualPathProvider.GetDirectoryName(filePath);
+                if (!_virtualPathProvider.DirectoryExists(folderPath))
+                    _virtualPathProvider.CreateDirectory(folderPath);
 
-                using (var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read)) {
+                using (var fileStream = _virtualPathProvider.CreateFile(filePath)) {
                     packageStream.CopyTo(fileStream);
                 }
             }
@@ -158,14 +162,15 @@ namespace Orchard.Packaging {
 
         private void EstablishPaths(ExpandContext context, IVirtualPathProvider virtualPathProvider) {
             context.SourcePath = "\\" + context.ExtensionName + "\\";
-            if (context.ExtensionType == "Theme") {
-                context.TargetPath = virtualPathProvider.MapPath("~/Themes-temp/" + context.ExtensionName);
-            }
-            else if (context.ExtensionType == "Module") {
-                context.TargetPath = virtualPathProvider.MapPath("~/Modules-temp/" + context.ExtensionName);
-            }
-            else {
-                throw new ApplicationException("Unknown extension type");
+            switch (context.ExtensionType) {
+                case "Theme":
+                    context.TargetPath = virtualPathProvider.Combine("~/Themes/" + context.ExtensionName);
+                    break;
+                case "Module":
+                    context.TargetPath = virtualPathProvider.Combine("~/Modules/" + context.ExtensionName);
+                    break;
+                default:
+                    throw new OrchardCoreException(T("Unknown extension type \"{0}\"", context.ExtensionType));
             }
         }
     }