Updated DeployClient application to use new response structure.

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);