Changeset 1748

Timestamp:

02/04/10 08:47:01 (3 years ago)

Author:

lowjoel

Message:

Various Updater fixes. Addresses #307: Eraser Updater restructuring

• Deal with update types better - instead of mapping DownloadTypes? to strings, we map it directly to the ListViewGroup?
• Fixed download progress messages
• Deal with install errors properly (Win32Exception)
• Fixed the status text when installing downloads

File:

• branches/eraser6/CodeReview/Eraser/UpdateForm.cs (modified) (12 diffs)

branches/eraser6/CodeReview/Eraser/UpdateForm.cs

@@ -146 +146 @@
             //Get a list of translatable categories (this will change as more categories
             //are added)
-            Dictionary<DownloadType, string> categories = new Dictionary<DownloadType, string>();
-            categories.Add(DownloadType.Update, S._("Updates"));
-            categories.Add(DownloadType.Plugin, S._("Plugins"));
+            updatesLv.Groups.Add(DownloadType.Update.ToString(), S._("Updates"));
+            updatesLv.Groups.Add(DownloadType.Plugin.ToString(), S._("Plugins"));
+            updatesLv.Groups.Add(DownloadType.Build.ToString(), S._("Nightly builds"));
 
             //Only include those whose architecture is compatible with ours.
@@ -176 +176 @@
                     continue;
 
-                //Create or retrieve the ListViewGroup object to categorise our downloads.
-                string categoryText = categories.ContainsKey(download.Type) ?
-                    categories[download.Type] : download.Type.ToString();
-                int groupIndex = updatesLv.Groups.IndexOf(new ListViewGroup(categoryText));
-                if (groupIndex == -1)
-                    groupIndex = updatesLv.Groups.Add(new ListViewGroup(categoryText));
-                ListViewGroup group = updatesLv.Groups[groupIndex];
+                //Get the group this download belongs to.
+                ListViewGroup group = updatesLv.Groups[download.Type.ToString()];
 
                 //Add the item to the list of downloads available.
@@ -320 +315 @@
             else
             {
-                if (e.Progress.Progress >= 1.0f)
+                if (overallProgress.CurrentStep.Progress.Progress >= 1.0f)
                 {
                     downloadUIInfo.ListViewItem.ImageIndex = -1;
@@ -327 +322 @@
                 else
                 {
-                    downloadUIInfo.Downloaded = (long)(overallProgress.Progress * download.FileSize);
+                    downloadUIInfo.Downloaded = (long)
+                        (overallProgress.CurrentStep.Progress.Progress * download.FileSize);
                     downloadUIInfo.ListViewItem.ImageIndex = 0;
                     downloadUIInfo.ListViewItem.SubItems[1].Text = FileSize.ToString(download.FileSize -
@@ -397 +393 @@
             {
                 ++progress.Completed;
-                int exitCode = download.Install();
-                
-                if (exitCode == 0)
+
+                try
+                {
                     installer_ProgressChanged(download,
                         new ProgressChangedEventArgs(progress, null));
-                else
+                    download.Install();
                     installer_ProgressChanged(download,
-                        new ProgressChangedEventArgs(progress,
-                            new ApplicationException(S._(
-                                "The installer exited with an error code {0}", exitCode))));
+                        new ProgressChangedEventArgs(progress, null));
+                }
+                catch (Exception ex)
+                {
+                    installer_ProgressChanged(download,
+                        new ProgressChangedEventArgs(progress, ex));
+                }
             }
 
@@ -441 +441 @@
             else
             {
-                downloadUIInfo.ListViewItem.SubItems[1].Text = S._("Installed {0}", download.Name);
                 switch (downloadUIInfo.ListViewItem.ImageIndex)
                 {
                     case -1:
+                        downloadUIInfo.ListViewItem.SubItems[1].Text =
+                            S._("Installing {0}", download.Name);
                         downloadUIInfo.ListViewItem.ImageIndex = 1;
                         break;
                     case 1:
+                        downloadUIInfo.ListViewItem.SubItems[1].Text =
+                            S._("Installed {0}", download.Name);
                         downloadUIInfo.ListViewItem.ImageIndex = 2;
                         break;
@@ -525 +528 @@
                 HttpRequestCacheLevel.Revalidate);
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(
-                new Uri("http://eraser.heidi.ie/scripts/updates?action=listupdates&version=" +
-                    Assembly.GetExecutingAssembly().GetName().Version.ToString()));
+                new Uri("http://eraser.heidi.ie/scripts/updates?action=listupdates&version=6.1.0.0" /*+
+                    Assembly.GetExecutingAssembly().GetName().Version.ToString()*/));
 
             using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
@@ -561 +564 @@
         {
             //Move the XmlReader to the root node
-            XmlReader rdr = XmlReader.Create(strm);
-            rdr.ReadToFollowing("updateList");
+            XmlReader reader = XmlReader.Create(strm);
+            reader.ReadToFollowing("updateList");
 
             //Read the descendants of the updateList node (ignoring the <mirrors> element)
             //These are categories.
-            XmlReader categories = rdr.ReadSubtree();
-            bool cont = categories.ReadToDescendant("mirrors");
-            if (!cont)
-                throw new InvalidDataException();
-            cont = categories.Read();
+            bool cont = reader.Read();
+            while (reader.NodeType != XmlNodeType.Element)
+                cont = reader.Read();
+            if (reader.NodeType != XmlNodeType.Element)
+                return new List<DownloadInfo>();
 
             List<DownloadInfo> result = new List<DownloadInfo>();
-            while (cont)
-            {
-                if (categories.NodeType == XmlNodeType.Element)
-                {
-                    result.AddRange(ParseDownloadCategory(categories.Name, categories.ReadSubtree()));
-                }
-
-                cont = categories.Read();
-            }
+            do
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    result.AddRange(ParseDownloadCategory(reader.Name, reader.ReadSubtree()));
+                }
+
+                cont = reader.Read();
+            }
+            while (cont);
 
             return result;
@@ -605 +609 @@
 
                 result.Add(new DownloadInfo(rdr.GetAttribute("name"),
-                    (DownloadType)Convert.ChangeType(category, typeof(DownloadType)),
+                    (DownloadType)Enum.Parse(typeof(DownloadType), category, true),
                     new Version(rdr.GetAttribute("version")), rdr.GetAttribute("publisher"),
                     rdr.GetAttribute("architecture"), Convert.ToInt64(rdr.GetAttribute("filesize")),
@@ -634 +638 @@
         /// The download is a plugin.
         /// </summary>
-        Plugin
+        Plugin,
+
+        /// <summary>
+        /// The download is a nightly build.
+        /// </summary>
+        Build
     }
 
@@ -752 +761 @@
         /// </summary>
         /// <returns>The exit code of the program.</returns>
-        public int Install()
+        public void Install()
         {
             if (DownloadedFile == null || !DownloadedFile.Exists || DownloadedFile.Length == 0)
@@ -761 +770 @@
             info.FileName = DownloadedFile.FullName;
             info.UseShellExecute = true;
-            //info.Verb = "runas";
 
             Process process = Process.Start(info);
             process.WaitForExit(Int32.MaxValue);
-            return process.ExitCode;
         }