Merge branch 'polydep-41' into 'development'

polydep-41

See merge request !5

Author: anierzad

DeployClient/API.cs

@@ -92,7 +92,7 @@ public static void AddPackageAsync(string sessionGuid, Stream stream, string fil
             }
         }
 
-        public static bool Install(string sessionGuid, out Dictionary<string, dynamic> response)
+        public static bool Install(string sessionGuid, out SortedList<string, dynamic> response)
         {
             string endpoint = string.Format("Remote/Install?sessionGuid={0}", sessionGuid);
 
@@ -112,7 +112,7 @@ public static bool Install(string sessionGuid, out Dictionary<string, dynamic> r
                     {
                         success = true;
                         string json = httpResponse.Content.ReadAsStringAsync().Result;
-                        response = jsonSer.Deserialize<Dictionary<string, dynamic>>(json);
+                        response = jsonSer.Deserialize<SortedList<string, dynamic>>(json);
                     }
                 }
                 catch (Exception ex)

DeployClient/Program.cs

@@ -145,7 +145,7 @@ static void Main(string[] args)
                 JavaScriptSerializer jsonSer = new JavaScriptSerializer();
 
                 // Start.
-                Dictionary<string, dynamic> results = null;
+                SortedList<string, dynamic> results = null;
 
                 if (!API.Install(sessionGuid, out results))
                 {
@@ -172,19 +172,16 @@ static void Main(string[] args)
                         if (response.ContainsKey("Response"))
                         {
                             // Yes, get the response.
-                            results = jsonSer.Deserialize<Dictionary<string, dynamic>>(response["Response"]);
+                            results = jsonSer.Deserialize<SortedList<string, dynamic>>(response["Response"]);
                         }
 
                         // As long as we have something.
                         if (status != -1 && results != null)
-                        {   
-                            // Get the installed and failed lists.
-                            ArrayList installed = results.ContainsKey("Installed") ? results["Installed"] : null;
-                            ArrayList failed = results.ContainsKey("Failed") ? results["Failed"] : null;
-
-                            // Give some feedback on it, only if it's changed.
-                            string print = string.Format("\t{0} module archives processed, {0}/{1} succeeded.", installed.Count + failed.Count, installed.Count);
+                        {
+                            // Build feedback.
+                            string print = BuildUpdateString(results);
 
+                            // Same as previous feedback?
                             if (print != previousPrint)
                             {
                                 WriteLine(print);
@@ -204,15 +201,14 @@ static void Main(string[] args)
                 }
                 else
                 {
-                    // Get the installed and failed lists.
-                    ArrayList installed = results.ContainsKey("Installed") ? results["Installed"] : null;
-                    ArrayList failed = results.ContainsKey("Failed") ? results["Failed"] : null;
+                    // Build feedback.
+                    string print = BuildUpdateString(results);
 
-                    // Give some feedback on it.
-                    WriteLine(string.Format("\t{0} module archives processed, {0}/{1} succeeded.", installed.Count + failed.Count, installed.Count));
-                    
+                    // Print feedback.
+                    WriteLine(print);   
                 }
 
+                // Finished install.
                 WriteLine(string.Format("Finished installation in {0} ms.", (DateTime.Now - installStartTime).TotalMilliseconds));
                 ReadLine();
             }
@@ -227,6 +223,35 @@ static void Main(string[] args)
             }
         }
 
+        private static string BuildUpdateString(SortedList<string, dynamic> results)
+        {
+            // Get counts.
+            int attempted = 0;
+            int succeeded = 0;
+            int failed = 0;
+
+            foreach (KeyValuePair<string, dynamic> kvp in results)
+            {
+                Dictionary<string, dynamic> module = kvp.Value;
+
+                if (module.ContainsKey("Attempted") && (bool)module["Attempted"])
+                {
+                    attempted++;
+
+                    if (module.ContainsKey("Success") && (bool)module["Success"])
+                    {
+                        succeeded++;
+                    }
+                    else
+                    {
+                        failed++;
+                    }
+                }
+            }
+
+            return string.Format("\t{0}/{1} module archives processed, {2}/{0} succeeded.", attempted, results.Count, succeeded);
+        }
+
         private static void WriteException(Exception ex, int maxDepth = 10, int depth = 0)
         {
             WriteLine(ex.Message);

PolyDeploy/Clients/Core/src/js/services/SessionDataService.js

@@ -16,7 +16,7 @@
 
                     // Parse if we need to.
                     if (data.Response) {
-                        data.Response = JSON.parse(data.Response);
+                        data.Response = parseSessionResponse(data.Response);
                     } else {
                         data.Response = undefined;
                     }
@@ -38,7 +38,7 @@
 
                     // Parse if we need to.
                     if (data.Response) {
-                        data.Response = JSON.parse(data.Response);
+                        data.Response = parseSessionResponse(data.Response);
                     } else {
                         data.Response = undefined;
                     }
@@ -107,6 +107,28 @@
             $http.get(controllerUrl + 'Install?guid=' + guid);
         }
 
+        function parseSessionResponse(rawResponse) {
+
+            // Parse to json.
+            var response = JSON.parse(rawResponse);
+
+            var newResponse = [];
+
+            // Tidy the response to make it easier to deal with.
+            for (var key in response) {
+
+                var modulePackage = response[key];
+
+                modulePackage.Order = parseInt(key);
+
+                newResponse.push(modulePackage);
+            }
+
+            console.log(newResponse);
+
+            return newResponse;
+        }
+
         return {
             create: create,
             get: get,

PolyDeploy/Clients/Deploy/src/js/controllers/ResultController.js

@@ -32,8 +32,18 @@
             var response = session.Response;
 
             // Get counts.
-            var installed = response.Installed.length;
-            var failed = response.Failed.length;
+            var installed = 0;
+            var failed = 0;
+
+            response.forEach(function (modPackage) {
+
+                // Attempted install?
+                if (modPackage.Attempted) {
+
+                    // Success?
+                    modPackage.Success ? installed++ : failed++;
+                }
+            });
 
             // Create start of string.
             var installStatus = 'Installation ';
@@ -57,4 +67,22 @@
             return installStatus;
         };
 
+        // Get CSS class to apply to module panel.
+        $scope.panelStatus = function (modPackage) {
+
+            // Default class.
+            var panelClass = 'panel-default';
+
+            // Attempted install?
+            if (modPackage.Attempted) {
+
+                // Success?
+                panelClass = modPackage.Success ? 'panel-success' : 'panel-danger';
+            }
+
+            console.log(panelClass);
+
+            return panelClass;
+        };
+
     }];

PolyDeploy/Clients/Deploy/src/js/templates/result.html

@@ -21,59 +21,36 @@ <h4>{{ currentStatus(session) }}</h4>
 
             <div class="row">
 
-                <!-- Installed -->
-                <div class="col-xs-12 col-md-6">
-                    <div class="panel panel-success">
+                <!-- Packages -->
+                <div ng-repeat="packageZip in session.Response" class="col-xs-12 col-md-6">
+                    <div class="panel" ng-class="panelStatus(packageZip)">
                         <div class="panel-heading">
-                            <h4 class="panel-title">Installed</h4>
+                            <h4 class="panel-title">{{ packageZip.Name }}</h4>
                         </div>
                         <div class="panel-body">
-                            <div class="module-info" ng-repeat="module in session.Response.Installed">
-                                <h4>{{ module.Name }}</h4>
+                            <div class="module-info">
+
                                 <h5>Packages</h5>
-                                <div ng-repeat="package in module.Packages">
+                                <div ng-repeat="package in packageZip.Packages">
                                     <ul class="package-info">
                                         <li><strong>Name:</strong> {{ package.Name }}</li>
                                         <li><strong>Version:</strong> {{ package.VersionStr }}</li>
                                     </ul>
                                 </div>
-                                <hr />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- /Installed -->
 
-                <!-- Failures -->
-                <div class="col-xs-12 col-md-6">
-                    <div class="panel panel-danger">
-                        <div class="panel-heading">
-                            <h4 class="panel-title">Failures</h4>
-                        </div>
-                        <div class="panel-body">
-                            <div class="module-info" ng-repeat="module in session.Response.Failed">
-
-                                <h5>Packages</h5>
-                                <div ng-repeat="package in module.Packages">
-                                    <ul class="package-info">
-                                        <li><strong>Name:</strong> {{ package.Name }}</li>
-                                        <li><strong>Version:</strong> {{ package.VersionStr }}</li>
+                                <div ng-show="packageZip.Failures && packageZip.Failures.length > 0">
+                                    <h5>Failures</h5>
+                                    <ul>
+                                        <li ng-repeat="failure in packageZip.Failures">
+                                            {{ failure }}
+                                        </li>
                                     </ul>
                                 </div>
-
-                                <h5>Failures</h5>
-                                <ul>
-                                    <li ng-repeat="failure in module.Failures">
-                                        {{ failure }}
-                                    </li>
-                                </ul>
-                                <hr />
-
                             </div>
                         </div>
                     </div>
                 </div>
-                <!-- /Failures -->
+                <!-- /Packages -->
 
             </div>
 

PolyDeploy/Components/Deployment.cs

@@ -66,46 +66,38 @@ public SortedList<int, InstallJob> Summary()
         public void Deploy()
         {
             // Do the install.
-            List<InstallJob> successJobs = new List<InstallJob>();
-            List<InstallJob> failedJobs = new List<InstallJob>();
-
-            Dictionary<string, List<InstallJob>> results = new Dictionary<string, List<InstallJob>>();
-
-            results.Add("Installed", successJobs);
-            results.Add("Failed", failedJobs);
-
             JavaScriptSerializer jsonSer = new JavaScriptSerializer();
             SessionDataController dc = new SessionDataController();
 
             // Set as started.
             Session.Status = SessionStatus.InProgess;
             dc.Update(Session);
 
+            // Install in order.
             foreach (KeyValuePair<int, InstallJob> keyPair in OrderedInstall)
             {
+                // Get install job.
                 InstallJob job = keyPair.Value;
 
-                if (job.Install())
-                {
-                    successJobs.Add(job);
-                }
-                else
+                // Attempt install.
+                job.Install();
+
+                // Make sorted list serialisable.
+                SortedList<string, InstallJob> serOrderedInstall = new SortedList<string, InstallJob>();
+
+                foreach(KeyValuePair<int, InstallJob> pair in OrderedInstall)
                 {
-                    failedJobs.Add(job);
+                    serOrderedInstall.Add(pair.Key.ToString(), pair.Value);
                 }
 
                 // After each install job, update response.
-                Session.Response = jsonSer.Serialize(results);
+                Session.Response = jsonSer.Serialize(serOrderedInstall);
                 dc.Update(Session);
             }
 
             // Done.
             Session.Status = SessionStatus.Complete;
             dc.Update(Session);
-
-            // Log failures.
-            LogAnyFailures(successJobs);
-            LogAnyFailures(failedJobs);
         }
 
         protected virtual void LogAnyFailures(List<InstallJob> jobs)

PolyDeploy/Components/InstallJob.cs

@@ -13,6 +13,8 @@ internal class InstallJob
         public string Name { get; set; }
         public List<PackageJob> Packages { get; set; }
         public List<string> Failures { get; set; }
+        public bool Attempted { get; set; }
+        public bool Success { get; set; }
 
         public bool CanInstall
         {
@@ -37,6 +39,8 @@ public InstallJob(string path)
             Name = Path.GetFileName(path);
             Packages = new List<PackageJob>();
             Failures = new List<string>();
+            Attempted = false;
+            Success = false;
             Installer = new Installer(new FileStream(path, FileMode.Open, FileAccess.Read), Globals.ApplicationMapPath, true, false);
 
             foreach (KeyValuePair<int, PackageInstaller> orderedPackage in Installer.Packages)
@@ -62,14 +66,15 @@ public void CheckDependencies(List<PackageJob> packageJobs)
             }
         }
 
-        public bool Install()
+        public void Install()
         {
-            bool installSuccess = false;
+            // Record that we have attempted an install.
+            Attempted = true;
 
             // Can this be installed at this point?
             if (CanInstall)
             {
-                // Possibly need to recreate the installer at the point.
+                // Possibly need to recreate the installer at this point.
                 Installer = new Installer(Installer.TempInstallFolder, ModuleManifestName(Installer.TempInstallFolder), Globals.ApplicationMapPath, true);
 
                 // Is the installer valid?
@@ -86,7 +91,7 @@ public bool Install()
                     Installer.Install();
 
                     // Did the package install successfully?
-                    installSuccess = Installer.IsValid;
+                    Success = Installer.IsValid;
                 }
 
                 // Record failures.
@@ -100,8 +105,6 @@ public bool Install()
                     }
                 }
             }
-
-            return installSuccess;
         }
 
         private bool FindDependency(string name, List<PackageJob> packageJobs)