Working on PPC packages...

1 files changed, 24 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index ae3e093be..33a6d04e6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -19,6 +19,7 @@ using Tango.Integration.Upgrade;
 using Tango.PMR.Synchronization;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Connection;
+using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.UpdatePackages;
 using Tango.PPC.Common.Web;
 using Tango.Settings;
@@ -33,6 +34,7 @@ namespace Tango.PPC.Common.MachineUpdate
         private IPPCApplicationManager _app_manager;
         private IMachineProvider _machineProvider;
         private IPackageRunner _packageRunner;
+        private INavigationManager _navigationManager;
         private PPCWebClient _client;
 
         #region Events
@@ -66,7 +68,7 @@ namespace Tango.PPC.Common.MachineUpdate
         /// Initializes a new instance of the <see cref="MachineUpdateManager"/> class.
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
-        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner)
+        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner, INavigationManager navigationManager)
         {
             _client = ppcWebClient;
             _machineProvider = machineProvider;
@@ -81,7 +83,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
         private void _packageRunner_PackageStateChanged(object sender, PackageStateChangedEventArgs e)
         {
-            UpdateProgress("Preparing", e.PackageName);
+            UpdateProgress(e.PackageType == PackageType.Pre ? "Preparing" : "Finalizing", e.PackageName);
         }
 
         #endregion
@@ -833,6 +835,26 @@ namespace Tango.PPC.Common.MachineUpdate
             });
         }
 
+        /// <summary>
+        /// Checks whether any post update packages needs to be installed.
+        /// </summary>
+        /// <returns></returns>
+        public Task<bool> PostUpdatePackagesRequired()
+        {
+            String packagesFolder = Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "packages");
+            return _packageRunner.IsPackageInstallationRequired(PackageType.Post, packagesFolder);
+        }
+
+        /// <summary>
+        /// Runs all post update packages.
+        /// </summary>
+        /// <returns></returns>
+        public Task<PackageRunnerResult> RunPostUpdatePackages()
+        {
+            String packagesFolder = Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "packages");
+            return _packageRunner.Run(PackageType.Post, packagesFolder);
+        }
+
         #endregion
 
         #region Protected Methods