From 367d2d7d66dde1a75996c755c60cbba2eb4ad6ae Mon Sep 17 00:00:00 2001
From: Lombiq <github@lombiq.com>
Date: Thu, 23 May 2019 14:13:16 +0200
Subject: [PATCH] Packaging: Code styling in PackageInstaller and
 PackageManager

---
 .../Services/PackageInstaller.cs              | 25 ++++++++++---------
 .../Services/PackageManager.cs                |  2 --
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs
index 82f7dadb1..b8b4726e4 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs
@@ -44,7 +44,7 @@ namespace Orchard.Packaging.Services {
         }
 
         public Localizer T { get; set; }
-        public Logging.ILogger Logger { get; set;  }
+        public Logging.ILogger Logger { get; set; }
 
         public PackageInfo Install(string packageId, string version, string location, string applicationPath) {
             // instantiates the appropriate package repository
@@ -94,8 +94,8 @@ namespace Orchard.Packaging.Services {
             // check the new package is compatible with current Orchard version
             var descriptor = package.GetExtensionDescriptor(packageInfo.ExtensionType);
 
-            if(descriptor != null) {
-                if(new FlatPositionComparer().Compare(descriptor.OrchardVersion, typeof(ContentItem).Assembly.GetName().Version.ToString()) >= 0) {
+            if (descriptor != null) {
+                if (new FlatPositionComparer().Compare(descriptor.OrchardVersion, typeof(ContentItem).Assembly.GetName().Version.ToString()) >= 0) {
                     if (previousInstalled) {
                         // restore the previous version
                         RestoreExtensionFolder(package.ExtensionFolder(), package.ExtensionId());
@@ -107,7 +107,7 @@ namespace Orchard.Packaging.Services {
 
                     Logger.Error(String.Format("The package is compatible with version {0} and above. Please update Orchard or install another version of this package.", descriptor.OrchardVersion));
                     throw new OrchardException(T("The package is compatible with version {0} and above. Please update Orchard or install another version of this package.", descriptor.OrchardVersion));
-                }    
+                }
             }
 
             return packageInfo;
@@ -136,8 +136,8 @@ namespace Orchard.Packaging.Services {
                     var packageManager = new NuGetPackageManager(
                         packageRepository,
                         new DefaultPackagePathResolver(sourceLocation),
-                        new PhysicalFileSystem(installedPackagesPath) {Logger = logger}
-                        ) {Logger = logger};
+                        new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
+                        ) { Logger = logger };
 
                     packageManager.InstallPackage(package, true);
                     installed = true;
@@ -183,7 +183,8 @@ namespace Orchard.Packaging.Services {
 
             if (packageId.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Theme))) {
                 extensionFullPath = _virtualPathProvider.MapPath("~/Themes/" + packageId.Substring(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Theme).Length));
-            } else if (packageId.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Module))) {
+            }
+            else if (packageId.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Module))) {
                 extensionFullPath = _virtualPathProvider.MapPath("~/Modules/" + packageId.Substring(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Module).Length));
             }
 
@@ -203,13 +204,13 @@ namespace Orchard.Packaging.Services {
                 var sourcePackageRepository = new LocalPackageRepository(installedPackagesPath);
 
                 try {
-                    var project = new FileBasedProjectSystem(applicationPath) {Logger = logger};
+                    var project = new FileBasedProjectSystem(applicationPath) { Logger = logger };
                     var projectManager = new ProjectManager(
                         sourcePackageRepository,
                         new DefaultPackagePathResolver(installedPackagesPath),
                         project,
                         new ExtensionReferenceRepository(project, sourcePackageRepository, _extensionManager)
-                        ) {Logger = logger};
+                        ) { Logger = logger };
 
                     // add the package to the project
                     projectManager.RemovePackageReference(packageId);
@@ -222,8 +223,8 @@ namespace Orchard.Packaging.Services {
                     var packageManager = new NuGetPackageManager(
                         sourcePackageRepository,
                         new DefaultPackagePathResolver(applicationPath),
-                        new PhysicalFileSystem(installedPackagesPath) {Logger = logger}
-                        ) {Logger = logger};
+                        new PhysicalFileSystem(installedPackagesPath) { Logger = logger }
+                        ) { Logger = logger };
 
                     packageManager.UninstallPackage(packageId);
                 }
@@ -316,7 +317,7 @@ namespace Orchard.Packaging.Services {
                 Uninstall(package.Id, _virtualPathProvider.MapPath("~\\"));
                 _notifier.Information(T("Successfully un-installed local package {0}", package.ExtensionId()));
             }
-            catch {}
+            catch { }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
index 1ce9542ac..931ca88e7 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
@@ -1,9 +1,7 @@
 using System;
-using System.IO;
 using System.Linq;
 using NuGet;
 using Orchard.Environment.Extensions;
-using Orchard.Environment.Extensions.Folders;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.Features;
 using Orchard.Environment.State;