Split bootstrapper methods to ensure lazy loading

bonsai-rx · Apr 30, 2020 · 9498cec · 9498cec
1 parent fd7f876
commit 9498cec
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 116 deletions.
diff --git a/Bonsai/Bootstrapper.cs b/Bonsai/Bootstrapper.cs
@@ -0,0 +1,131 @@
+using Bonsai.Configuration;
+using Bonsai.NuGet;
+using Bonsai.Properties;
+using NuGet;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using PackageReference = Bonsai.Configuration.PackageReference;
+using PackageHelper = Bonsai.NuGet.PackageHelper;
+
+namespace Bonsai
+{
+    class Bootstrapper
+    {
+        static bool visualStylesEnabled;
+
+        protected static void EnableVisualStyles()
+        {
+            if (!visualStylesEnabled)
+            {
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                visualStylesEnabled = true;
+            }
+        }
+
+        protected static LicenseAwarePackageManager CreatePackageManager(string path)
+        {
+            var logger = new EventLogger();
+            var machineWideSettings = new BonsaiMachineWideSettings();
+            var settings = Settings.LoadDefaultSettings(new PhysicalFileSystem(AppDomain.CurrentDomain.BaseDirectory), null, machineWideSettings);
+            var sourceProvider = new PackageSourceProvider(settings);
+            var sourceRepository = sourceProvider.CreateAggregateRepository(PackageRepositoryFactory.Default, true);
+            return new LicenseAwarePackageManager(sourceRepository, path) { Logger = logger };
+        }
+
+        static SemanticVersion ParseVersion(string version)
+        {
+            if (string.IsNullOrEmpty(version)) return null;
+            return SemanticVersion.Parse(version);
+        }
+
+        static IEnumerable<PackageReference> GetMissingPackages(IEnumerable<PackageReference> packages, IPackageRepository repository)
+        {
+            return from package in packages
+                   let version = ParseVersion(package.Version)
+                   where !repository.Exists(package.Id, version)
+                   select package;
+        }
+
+        internal static IPackage GetEditorPackage(
+            PackageConfiguration packageConfiguration,
+            string editorRepositoryPath,
+            string editorPath,
+            IPackageName editorPackageName)
+        {
+            const string OldExtension = ".old";
+            var backupExePath = editorPath + OldExtension;
+            if (File.Exists(backupExePath))
+            {
+                try { File.Delete(backupExePath); }
+                catch { } // best effort
+            }
+
+            var packageManager = CreatePackageManager(editorRepositoryPath);
+            var missingPackages = GetMissingPackages(packageConfiguration.Packages, packageManager.LocalRepository).ToList();
+            if (missingPackages.Count > 0)
+            {
+                EnableVisualStyles();
+                using (var monitor = new PackageConfigurationUpdater(packageConfiguration, packageManager, editorPath, editorPackageName))
+                {
+                    PackageHelper.RunPackageOperation(packageManager, () =>
+                        Task.Factory.ContinueWhenAll(missingPackages.Select(package =>
+                        packageManager.StartRestorePackage(package.Id, ParseVersion(package.Version))).ToArray(), operations =>
+                        {
+                            foreach (var task in operations)
+                            {
+                                if (task.IsFaulted || task.IsCanceled) continue;
+                                var package = task.Result;
+                                if (packageManager.LocalRepository.Exists(package.Id))
+                                {
+                                    packageManager.UpdatePackage(
+                                        package,
+                                        updateDependencies: false,
+                                        allowPrereleaseVersions: true);
+                                }
+                                else
+                                {
+                                    packageManager.InstallPackage(
+                                        package,
+                                        ignoreDependencies: true,
+                                        allowPrereleaseVersions: true,
+                                        ignoreWalkInfo: true);
+                                }
+                            }
+
+                            Task.WaitAll(operations);
+                        }));
+                }
+            }
+
+            var editorPackage = packageManager.LocalRepository.FindPackage(editorPackageName.Id);
+            if (editorPackage == null || editorPackage.Version < editorPackageName.Version)
+            {
+                EnableVisualStyles();
+                using (var monitor = new PackageConfigurationUpdater(packageConfiguration, packageManager, editorPath, editorPackageName))
+                {
+                    PackageHelper.RunPackageOperation(
+                        packageManager,
+                        () => packageManager
+                            .StartInstallPackage(editorPackageName.Id, editorPackageName.Version)
+                            .ContinueWith(task => editorPackage = task.Result),
+                        operationLabel: editorPackage != null ? "Updating..." : null);
+                    if (editorPackage == null)
+                    {
+                        var assemblyName = Assembly.GetEntryAssembly().GetName();
+                        var errorMessage = editorPackage == null ? Resources.InstallEditorPackageError : Resources.UpdateEditorPackageError;
+                        MessageBox.Show(errorMessage, assemblyName.Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return null;
+                    }
+                }
+            }
+
+            return editorPackage;
+        }
+    }
+}
diff --git a/Bonsai/Launcher.cs b/Bonsai/Launcher.cs
@@ -7,132 +7,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml;
 using System.Xml.Serialization;
-using PackageReference = Bonsai.Configuration.PackageReference;
 using PackageHelper = Bonsai.NuGet.PackageHelper;
 using Bonsai.Properties;
 
 namespace Bonsai
 {
-    class Launcher
+    class Launcher : Bootstrapper
     {
-        static bool visualStylesEnabled;
-
-        static void EnableVisualStyles()
-        {
-            if (!visualStylesEnabled)
-            {
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
-                visualStylesEnabled = true;
-            }
-        }
-
-        static LicenseAwarePackageManager CreatePackageManager(string path)
-        {
-            var logger = new EventLogger();
-            var machineWideSettings = new BonsaiMachineWideSettings();
-            var settings = Settings.LoadDefaultSettings(new PhysicalFileSystem(AppDomain.CurrentDomain.BaseDirectory), null, machineWideSettings);
-            var sourceProvider = new PackageSourceProvider(settings);
-            var sourceRepository = sourceProvider.CreateAggregateRepository(PackageRepositoryFactory.Default, true);
-            return new LicenseAwarePackageManager(sourceRepository, path) { Logger = logger };
-        }
-
-        static SemanticVersion ParseVersion(string version)
-        {
-            if (string.IsNullOrEmpty(version)) return null;
-            return SemanticVersion.Parse(version);
-        }
-
-        static IEnumerable<PackageReference> GetMissingPackages(IEnumerable<PackageReference> packages, IPackageRepository repository)
-        {
-            return from package in packages
-                   let version = ParseVersion(package.Version)
-                   where !repository.Exists(package.Id, version)
-                   select package;
-        }
-
-        internal static IPackage LaunchEditorBootstrapper(
-            PackageConfiguration packageConfiguration,
-            string editorRepositoryPath,
-            string editorPath,
-            IPackageName editorPackageName)
-        {
-            const string OldExtension = ".old";
-            var backupExePath = editorPath + OldExtension;
-            if (File.Exists(backupExePath))
-            {
-                try { File.Delete(backupExePath); }
-                catch { } // best effort
-            }
-
-            var packageManager = CreatePackageManager(editorRepositoryPath);
-            var missingPackages = GetMissingPackages(packageConfiguration.Packages, packageManager.LocalRepository).ToList();
-            if (missingPackages.Count > 0)
-            {
-                EnableVisualStyles();
-                using (var monitor = new PackageConfigurationUpdater(packageConfiguration, packageManager, editorPath, editorPackageName))
-                {
-                    PackageHelper.RunPackageOperation(packageManager, () =>
-                        Task.Factory.ContinueWhenAll(missingPackages.Select(package =>
-                        packageManager.StartRestorePackage(package.Id, ParseVersion(package.Version))).ToArray(), operations =>
-                        {
-                            foreach (var task in operations)
-                            {
-                                if (task.IsFaulted || task.IsCanceled) continue;
-                                var package = task.Result;
-                                if (packageManager.LocalRepository.Exists(package.Id))
-                                {
-                                    packageManager.UpdatePackage(
-                                        package,
-                                        updateDependencies: false,
-                                        allowPrereleaseVersions: true);
-                                }
-                                else
-                                {
-                                    packageManager.InstallPackage(
-                                        package,
-                                        ignoreDependencies: true,
-                                        allowPrereleaseVersions: true,
-                                        ignoreWalkInfo: true);
-                                }
-                            }
-
-                            Task.WaitAll(operations);
-                        }));
-                }
-            }
-
-            var editorPackage = packageManager.LocalRepository.FindPackage(editorPackageName.Id);
-            if (editorPackage == null || editorPackage.Version < editorPackageName.Version)
-            {
-                EnableVisualStyles();
-                using (var monitor = new PackageConfigurationUpdater(packageConfiguration, packageManager, editorPath, editorPackageName))
-                {
-                    PackageHelper.RunPackageOperation(
-                        packageManager,
-                        () => packageManager
-                            .StartInstallPackage(editorPackageName.Id, editorPackageName.Version)
-                            .ContinueWith(task => editorPackage = task.Result),
-                        operationLabel: editorPackage != null ? "Updating..." : null);
-                    if (editorPackage == null)
-                    {
-                        var assemblyName = Assembly.GetEntryAssembly().GetName();
-                        var errorMessage = editorPackage == null ? Resources.InstallEditorPackageError : Resources.UpdateEditorPackageError;
-                        MessageBox.Show(errorMessage, assemblyName.Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        return null;
-                    }
-                }
-            }
-
-            return editorPackage;
-        }
-
         internal static string LaunchPackageBootstrapper(
             PackageConfiguration packageConfiguration,
             string editorRepositoryPath,

diff --git a/Bonsai/Program.cs b/Bonsai/Program.cs
@@ -187,7 +187,7 @@ internal static int Main(string[] args)
                     }
                 }
             }
-            else if (Launcher.LaunchEditorBootstrapper(packageConfiguration, editorRepositoryPath, editorPath, editorPackageName) != null)
+            else if (Bootstrapper.GetEditorPackage(packageConfiguration, editorRepositoryPath, editorPath, editorPackageName) != null)
             {
                 args = Array.FindAll(args, arg => arg != DebugScriptCommand);
                 do
-Original file line number
+Diff line change
@@ Expand Up / @@ -187,7 +187,7 @@ internal static int Main(string[] args) @@
                         }
                     }
                 }
-                else if (Launcher.LaunchEditorBootstrapper(packageConfiguration, editorRepositoryPath, editorPath, editorPackageName) != null)
+                else if (Bootstrapper.GetEditorPackage(packageConfiguration, editorRepositoryPath, editorPath, editorPackageName) != null)
                 {
                     args = Array.FindAll(args, arg => arg != DebugScriptCommand);
                     do
@@ Expand Down @@