#16840: Implementing module installation from local uploaded file. Removing hard dependency between Orchard.Modules and Orchard.Packaging by delegating module installation to Orchard.Packaging.

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs

@@ -2,25 +2,26 @@ using System;
 using System.IO;
 using NuGet;
 using Orchard.Environment.Extensions;
+using Orchard.FileSystems.AppData;
 using Orchard.Localization;
 using Orchard.UI.Notify;
 using NuGetPackageManager = NuGet.PackageManager;
-using System.Security.Permissions;
-using System.Security;
-using System.Web.Hosting;
 
 namespace Orchard.Packaging.Services {
     [OrchardFeature("PackagingServices")]
     public class PackageInstaller : IPackageInstaller {
         private const string PackagesPath = "packages";
-        private const string SolutionFilename = "Orchard.sln";
 
         private readonly INotifier _notifier;
         private readonly IExtensionManager _extensionManager;
+        private readonly IAppDataFolderRoot _appDataFolderRoot;
 
-        public PackageInstaller(INotifier notifier, IExtensionManager extensionManager) {
+        public PackageInstaller(INotifier notifier, 
+            IExtensionManager extensionManager,
+            IAppDataFolderRoot appDataFolderRoot) {
             _notifier = notifier;
             _extensionManager = extensionManager;
+            _appDataFolderRoot = appDataFolderRoot;
 
             T = NullLocalizer.Instance;
         }
@@ -28,44 +29,53 @@ namespace Orchard.Packaging.Services {
         public Localizer T { get; set; }
 
         public PackageInfo Install(string packageId, string version, string location, string applicationPath) {
-            // this logger is used to render NuGet's log on the notifier
-            var logger = new NugetLogger(_notifier);
-
             // instantiates the appropriate package repository
-            var packageRepository = PackageRepositoryFactory.Default.CreateRepository(new PackageSource("Default", location));
+            IPackageRepository packageRepository = PackageRepositoryFactory.Default.CreateRepository(new PackageSource(location, "Default"));
 
             // gets an IPackage instance from the repository
             var packageVersion = String.IsNullOrEmpty(version) ? null : new Version(version);
             var package = packageRepository.FindPackage(packageId, packageVersion);
-
-            if (package == null) {
+            if (package == null)
+            {
                 throw new ArgumentException(T("The specified package could not be found, id:{0} version:{1}", packageId, String.IsNullOrEmpty(version) ? T("No version").Text : version).Text);
             }
 
+            return Install(package, packageRepository, location, applicationPath);
+        }
+
+        public PackageInfo Install(IPackage package, string location, string applicationPath) {
+            // instantiates the appropriate package repository
+            IPackageRepository packageRepository = PackageRepositoryFactory.Default.CreateRepository(new PackageSource(location, "Default"));
+            return Install(package, packageRepository, location, applicationPath);
+        }
+
+        protected PackageInfo Install(IPackage package, IPackageRepository packageRepository, string location, string applicationPath) {
+            // this logger is used to render NuGet's log on the notifier
+            var logger = new NugetLogger(_notifier);
+
             bool installed = false;
 
             // if we can access the parent directory, and the solution is inside, NuGet-install the package here
-            string solutionPath;
-            var installedPackagesPath = String.Empty;
-            if (TryGetSolutionPath(applicationPath, out solutionPath)) {
-                installedPackagesPath  = Path.Combine(solutionPath, PackagesPath);
-                try {
-                    var packageManager = new NuGetPackageManager(
-                            packageRepository,
-                            new DefaultPackagePathResolver(location),
-                            new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
-                        ) { Logger = logger };
+            var installedPackagesPath = Path.Combine(_appDataFolderRoot.RootFolder, PackagesPath);
 
-                    packageManager.InstallPackage(package, ignoreDependencies: true);
-                    installed = true;
-                }
-                catch {
-                    // installing the package at the solution level failed
-                }
+            try
+            {
+                var packageManager = new NuGetPackageManager(
+                        packageRepository,
+                        new DefaultPackagePathResolver(location),
+                        new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
+                    ) { Logger = logger };
+
+                packageManager.InstallPackage(package, ignoreDependencies: true);
+                installed = true;
+            }
+            catch
+            {
+                // installing the package in the appdata folder failed
             }
 
             // if the package got installed successfully, use it, otherwise use the previous repository
-            var sourceRepository = installed 
+            var sourceRepository = installed
                 ? new LocalPackageRepository(installedPackagesPath)
                 : packageRepository;
 
@@ -75,12 +85,13 @@ namespace Orchard.Packaging.Services {
                 new DefaultPackagePathResolver(applicationPath),
                 project,
                 new ExtensionReferenceRepository(project, sourceRepository, _extensionManager)
-                ) {Logger = logger};
+                ) { Logger = logger };
 
             // add the package to the project
-            projectManager.AddPackageReference(packageId, packageVersion);
+            projectManager.AddPackageReference(package.Id, package.Version);
 
-            return new PackageInfo {
+            return new PackageInfo
+            {
                 ExtensionName = package.Title ?? package.Id,
                 ExtensionVersion = package.Version.ToString(),
                 ExtensionType = package.Id.StartsWith("Orchard.Theme") ? "Theme" : "Module",
@@ -92,59 +103,26 @@ namespace Orchard.Packaging.Services {
             // this logger is used to render NuGet's log on the notifier
             var logger = new NugetLogger(_notifier);
 
-            string solutionPath;
-            // if we can access the parent directory, and the solution is inside, NuGet-uninstall the package here
-            if (TryGetSolutionPath(applicationPath, out solutionPath)) {
-                var installedPackagesPath = Path.Combine(solutionPath, PackagesPath);
+            var installedPackagesPath = Path.Combine(_appDataFolderRoot.RootFolder, PackagesPath);
+            var sourcePackageRepository = new LocalPackageRepository(installedPackagesPath);
+            var project = new FileBasedProjectSystem(applicationPath) { Logger = logger };
+            var projectManager = new ProjectManager(
+                sourcePackageRepository,
+                new DefaultPackagePathResolver(installedPackagesPath),
+                project,
+                new ExtensionReferenceRepository(project, sourcePackageRepository, _extensionManager)
+                ) { Logger = logger };
 
-                var sourcePackageRepository = new LocalPackageRepository(installedPackagesPath);
-                var project = new FileBasedProjectSystem(applicationPath) { Logger = logger };
-                var projectManager = new ProjectManager(
+            // add the package to the project
+            projectManager.RemovePackageReference(packageId);
+
+            var packageManager = new NuGetPackageManager(
                     sourcePackageRepository,
-                    new DefaultPackagePathResolver(installedPackagesPath),
-                    project,
-                    new ExtensionReferenceRepository(project, sourcePackageRepository, _extensionManager)
-                    ) { Logger = logger };
+                    new DefaultPackagePathResolver(applicationPath),
+                    new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
+                ) { Logger = logger };
 
-                // add the package to the project
-                projectManager.RemovePackageReference(packageId);
-
-                var packageManager = new NuGetPackageManager(
-                        sourcePackageRepository,
-                        new DefaultPackagePathResolver(applicationPath),
-                        new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
-                    ) { Logger = logger };
-
-                packageManager.UninstallPackage(packageId);
-            }
-            else {
-                // otherwise delete the folder
-
-                string extensionPath = packageId.StartsWith("Orchard.Themes.")
-                    ? "~/Themes/" + packageId.Substring("Orchard.Theme.".Length)
-                    : "~/Modules/" + packageId.Substring("Orchard.Module.".Length);
-
-                string extensionFullPath = HostingEnvironment.MapPath(extensionPath);
-
-                if (Directory.Exists(extensionFullPath)) {
-                    Directory.Delete(extensionFullPath, true);
-                }
-                else {
-                    throw new OrchardException(T("Package not found: ", packageId));
-                }
-            }
-        }
-
-        private bool TryGetSolutionPath(string applicationPath, out string parentPath) {
-            try {
-                parentPath = Directory.GetParent(applicationPath).Parent.FullName;
-                var solutionPath = Path.Combine(parentPath, SolutionFilename);
-                return File.Exists(solutionPath);
-            }
-            catch {
-                parentPath = null;
-                return false;
-            }
+            packageManager.UninstallPackage(packageId);
         }
     }
 }