Changing update system to use sqlite db for storage of values. Made a few changes to verify the downloaded installer exists and added some logging.

RandomEngy · RandomEngy · commit 1caa237712ce · 2011-07-23T20:15:56.000-07:00
diff --git a/Installer/VidCoder-x64.iss b/Installer/VidCoder-x64.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=VidCoder
-AppVerName=VidCoder 0.9.2 (x64)
+AppVerName=VidCoder 0.9.3 (x64)
 
 DefaultDirName={pf}\VidCoder
 DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
 SolidCompression=yes
 
 OutputDir=BuiltInstallers
-OutputBaseFilename=VidCoder-0.9.2-x64
+OutputBaseFilename=VidCoder-0.9.3-x64
 
 AppId=VidCoder-x64
 UsePreviousAppDir=yes
diff --git a/Installer/VidCoder-x86.iss b/Installer/VidCoder-x86.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=VidCoder
-AppVerName=VidCoder 0.9.2 (x86)
+AppVerName=VidCoder 0.9.3 (x86)
 
 DefaultDirName={pf}\VidCoder
 DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
 SolidCompression=yes
 
 OutputDir=BuiltInstallers
-OutputBaseFilename=VidCoder-0.9.2-x86
+OutputBaseFilename=VidCoder-0.9.3-x86
 
 AppId=VidCoder
 UsePreviousAppDir=yes
diff --git a/VidCoder/Model/Database.cs b/VidCoder/Model/Database.cs
@@ -17,14 +17,14 @@ public static string DatabaseFile
 		{
 			get
 			{
-                string appDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Utilities.AppDataFolderName);
+				string appDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Utilities.AppDataFolderName);
 
-                if (!Directory.Exists(appDataFolder))
-                {
-                    Directory.CreateDirectory(appDataFolder);
-                }
+				if (!Directory.Exists(appDataFolder))
+				{
+					Directory.CreateDirectory(appDataFolder);
+				}
 
-                return Path.Combine(appDataFolder, ConfigDatabaseFile);
+				return Path.Combine(appDataFolder, ConfigDatabaseFile);
 			}
 		}
 
diff --git a/VidCoder/Model/DatabaseConfig.cs b/VidCoder/Model/DatabaseConfig.cs
@@ -4,6 +4,7 @@
 using System.Data.SQLite;
 using System.Linq;
 using System.Text;
+using VidCoder.Services;
 
 namespace VidCoder.Model
 {
@@ -12,13 +13,22 @@ public static class DatabaseConfig
 		private static Dictionary<string, string> configDefaults;
 
 		static DatabaseConfig()
-        {
-            configDefaults = new Dictionary<string, string>
+		{
+			configDefaults = new Dictionary<string, string>
 			{
 				{"Version", Utilities.CurrentDatabaseVersion.ToString()},
-				{"EncodeJobs", string.Empty}
+				{"EncodeJobs", string.Empty},
+				{Updater.UpdateInProgress, "false"},
+				{Updater.UpdateVersion, string.Empty},
+				{Updater.UpdateInstallerLocation, string.Empty},
+				{Updater.UpdateChangelogLocation, string.Empty}
 			};
-        }
+		}
+
+		public static bool GetConfigBool(string configName, SQLiteConnection connection)
+		{
+			return bool.Parse(GetConfigString(configName, connection));
+		}
 
 		public static string GetConfigString(string configName, SQLiteConnection connection)
 		{
@@ -57,6 +67,11 @@ private static void AddConfigValue(string configName, string configValue, SQLite
 			}
 		}
 
+		public static void SetConfigValue(string configName, bool value, SQLiteConnection connection)
+		{
+			SetConfigValue(configName, value.ToString(), connection);
+		}
+
 		public static void SetConfigValue(string configName, string configValue, SQLiteConnection connection)
 		{
 			var command = new SQLiteCommand("UPDATE settings SET value = ? WHERE name = ?", connection);
diff --git a/VidCoder/Properties/AssemblyInfo.cs b/VidCoder/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.0")]
diff --git a/VidCoder/Properties/Settings.Designer.cs b/VidCoder/Properties/Settings.Designer.cs
diff --git a/VidCoder/Properties/Settings.settings b/VidCoder/Properties/Settings.settings
@@ -68,18 +68,6 @@
     <Setting Name="PreviewWindowOpen" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UpdateInstallerLocation" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="UpdateInProgress" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="UpdateVersion" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="UpdateChangelogLocation" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="UpdatesEnabled" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
diff --git a/VidCoder/Services/Updater.cs b/VidCoder/Services/Updater.cs
@@ -1,12 +1,14 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Data.SQLite;
 using System.Linq;
 using System.Text;
 using System.ComponentModel;
 using System.Xml.Linq;
 using System.IO;
 using System.Net;
 using System.Windows;
+using VidCoder.Model;
 using VidCoder.Properties;
 using System.Diagnostics;
 using Microsoft.Practices.Unity;
@@ -15,6 +17,11 @@ namespace VidCoder.Services
 {
 	public class Updater : IUpdater
 	{
+		public const string UpdateInProgress = "UpdateInProgress";
+		public const string UpdateVersion = "UpdateVersion";
+		public const string UpdateInstallerLocation = "UpdateInstallerLocation";
+		public const string UpdateChangelogLocation = "UpdateChangelogLocation";
+
 		public event EventHandler<EventArgs<double>> UpdateDownloadProgress;
 		public event EventHandler<EventArgs> UpdateDownloadCompleted;
 
@@ -30,6 +37,7 @@ private static bool DebugMode
 			}
 		}
 
+		private ILogger logger = Unity.Container.Resolve<ILogger>();
 		private BackgroundWorker updateDownloader;
 		private bool processDownloadsUpdates = true;
 
@@ -44,9 +52,9 @@ public void PromptToApplyUpdate()
 				// If updates are enabled, and we are the last process instance, prompt to apply the update.
 				if (Settings.Default.UpdatesEnabled && Utilities.CurrentProcessInstances == 1)
 				{
-					string installerPath = Settings.Default.UpdateInstallerLocation;
+					string installerPath = DatabaseConfig.GetConfigString(UpdateInstallerLocation, Database.Connection);
 
-					if (installerPath != string.Empty)
+					if (installerPath != string.Empty && File.Exists(installerPath))
 					{
 						// An update is ready, to give a prompt to apply it.
 						var updateConfirmation = new ApplyUpdateConfirmation();
@@ -79,10 +87,9 @@ public void ApplyUpdate()
 			// Re-check the process count in case another one was opened while the prompt was active.
 			if (Utilities.CurrentProcessInstances == 1)
 			{
-				string installerPath = Settings.Default.UpdateInstallerLocation;
+				string installerPath = DatabaseConfig.GetConfigString(UpdateInstallerLocation, Database.Connection);
 
-				Settings.Default.UpdateInProgress = true;
-				Settings.Default.Save();
+				DatabaseConfig.SetConfigValue(UpdateInProgress, true, Database.Connection);
 
 				var installerProcess = new Process();
 				installerProcess.StartInfo = new ProcessStartInfo { FileName = installerPath, Arguments = "/silent /noicons" };
@@ -100,7 +107,7 @@ public void HandleUpdatedSettings(bool updatesEnabled)
 				if (updatesEnabled)
 				{
 					// If we don't already have an update waiting to install, check for updates.
-					if (processDownloadsUpdates && Settings.Default.UpdateInstallerLocation == string.Empty)
+					if (processDownloadsUpdates && DatabaseConfig.GetConfigString(UpdateInstallerLocation, Database.Connection) == string.Empty)
 					{
 						this.StartBackgroundUpdate();
 					}
@@ -115,17 +122,29 @@ public void HandleUpdatedSettings(bool updatesEnabled)
 
 		public void HandlePendingUpdate()
 		{
-			bool updateInProgress = Settings.Default.UpdateInProgress;
-			string targetUpdateVersion = Settings.Default.UpdateVersion;
-
+			// This flag signifies VidCoder is being run by the installer after an update.
+			// In this case we report success, delete the installer, clean up the update flags and exit.
+			bool updateInProgress = DatabaseConfig.GetConfigBool(UpdateInProgress, Database.Connection);
 			if (updateInProgress)
 			{
-				Settings.Default.UpdateInProgress = false;
-				Settings.Default.Save();
+				string targetUpdateVersion = DatabaseConfig.GetConfigString(UpdateVersion, Database.Connection);
+				bool updateSucceeded = Utilities.CompareVersions(targetUpdateVersion, Utilities.CurrentVersion) == 0;
+
+				using (SQLiteTransaction transaction = Database.Connection.BeginTransaction())
+				{
+					DatabaseConfig.SetConfigValue(UpdateInProgress, false, Database.Connection);
+
+					if (updateSucceeded)
+					{
+						DatabaseConfig.SetConfigValue(UpdateVersion, string.Empty, Database.Connection);
+						DatabaseConfig.SetConfigValue(UpdateInstallerLocation, string.Empty, Database.Connection);
+						DatabaseConfig.SetConfigValue(UpdateChangelogLocation, string.Empty, Database.Connection);
+					}
+
+					transaction.Commit();
+				}
 
-				// This flag signifies VidCoder is being run by the installer after an update.
-				// In this case we report success, delete the installer, clean up the update flags and exit.
-				if (Utilities.CompareVersions(targetUpdateVersion, Utilities.CurrentVersion) == 0)
+				if (updateSucceeded)
 				{
 					MessageBox.Show("VidCoder has been successfully updated.");
 
@@ -134,18 +153,15 @@ public void HandlePendingUpdate()
 						Directory.Delete(Utilities.UpdatesFolder, true);
 					}
 
-					Settings.Default.UpdateVersion = string.Empty;
-					Settings.Default.UpdateInstallerLocation = string.Empty;
-					Settings.Default.UpdateChangelogLocation = string.Empty;
-					Settings.Default.Save();
-
 					Environment.Exit(0);
 				}
-
-				// If the target version is different from the currently running version,
-				// this means the attempted upgrade failed. We give an error message but
-				// continue with the program.
-				MessageBox.Show("The update was not applied. If you did not cancel it, try installing it manually.");
+				else
+				{
+					// If the target version is different from the currently running version,
+					// this means the attempted upgrade failed. We give an error message but
+					// continue with the program.
+					MessageBox.Show("The update was not applied. If you did not cancel it, try installing it manually.");
+				}
 			}
 		}
 
@@ -164,8 +180,7 @@ public void CheckUpdates()
 				if (!Settings.Default.UpdatesEnabled)
 				{
 					// On a program restart, if updates are disabled, clean any pending installers.
-					Settings.Default.UpdateInstallerLocation = string.Empty;
-					Settings.Default.Save();
+					DatabaseConfig.SetConfigValue(UpdateInstallerLocation, string.Empty, Database.Connection);
 
 					if (Directory.Exists(Utilities.UpdatesFolder))
 					{
@@ -200,6 +215,7 @@ private void StartBackgroundUpdate()
 		private void CheckAndDownloadUpdate(object sender, DoWorkEventArgs e)
 		{
 			var updateDownloader = sender as BackgroundWorker;
+			SQLiteConnection connection = Database.CreateConnection();
 
 			try
 			{
@@ -235,9 +251,28 @@ private void CheckAndDownloadUpdate(object sender, DoWorkEventArgs e)
 
 				if (Utilities.CompareVersions(updateVersion, Utilities.CurrentVersion) > 0)
 				{
+					// If an update is reported to be ready but the installer doesn't exist, clear out all the
+					// installer info and redownload.
+					string updateInstallerLocation = DatabaseConfig.GetConfigString(UpdateInstallerLocation, connection);
+					if (updateInstallerLocation != string.Empty && !File.Exists(updateInstallerLocation))
+					{
+						using (SQLiteTransaction transaction = connection.BeginTransaction())
+						{
+							DatabaseConfig.SetConfigValue(UpdateVersion, string.Empty, Database.Connection);
+							DatabaseConfig.SetConfigValue(UpdateInstallerLocation, string.Empty, Database.Connection);
+							DatabaseConfig.SetConfigValue(UpdateChangelogLocation, string.Empty, Database.Connection);
+							
+							transaction.Commit();
+						}
+
+						this.logger.Log("Downloaded update (" + updateInstallerLocation + ") could not be found. Re-downloading it.");
+					}
+
 					// If we have not finished the download update yet, start/resume the download.
-					if (Settings.Default.UpdateInstallerLocation == string.Empty)
+					if (DatabaseConfig.GetConfigString(UpdateInstallerLocation, connection) == string.Empty)
 					{
+						this.logger.Log("Started downloading update " + updateVersion);
+
 						string downloadLocation = downloadElement.Value;
 						string changelogLink = changelogLinkElement.Value;
 						string installerFileName = Path.GetFileName(downloadLocation);
@@ -269,7 +304,7 @@ private void CheckAndDownloadUpdate(object sender, DoWorkEventArgs e)
 							responseStream = response.GetResponseStream();
 
 							byte[] downloadBuffer = new byte[2048];
-							int bytesRead = 0;
+							int bytesRead;
 
 							while ((bytesRead = responseStream.Read(downloadBuffer, 0, downloadBuffer.Length)) > 0 && !updateDownloader.CancellationPending)
 							{
@@ -285,12 +320,18 @@ private void CheckAndDownloadUpdate(object sender, DoWorkEventArgs e)
 
 							if (bytesRead == 0)
 							{
-								Settings.Default.UpdateVersion = updateVersion;
-								Settings.Default.UpdateInstallerLocation = installerFilePath;
-								Settings.Default.UpdateChangelogLocation = changelogLink;
-								Settings.Default.Save();
+								using (SQLiteTransaction transaction = connection.BeginTransaction())
+								{
+									DatabaseConfig.SetConfigValue(UpdateVersion, updateVersion, connection);
+									DatabaseConfig.SetConfigValue(UpdateInstallerLocation, installerFilePath, connection);
+									DatabaseConfig.SetConfigValue(UpdateChangelogLocation, changelogLink, connection);
+									
+									transaction.Commit();
+								}
 
 								this.UpdateReady = true;
+
+								this.logger.Log("Update " + updateVersion + " has finished downloading and will install on exit.");
 							}
 						}
 						finally
diff --git a/VidCoder/View/ApplyUpdateConfirmation.xaml.cs b/VidCoder/View/ApplyUpdateConfirmation.xaml.cs
diff --git a/VidCoder/app.config b/VidCoder/app.config

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public static string DatabaseFile`
`17`	`17`	`{`
`18`	`18`	`get`
`19`	`19`	`{`
`20`		`- string appDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Utilities.AppDataFolderName);`
	`20`	`+ string appDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Utilities.AppDataFolderName);`
`21`	`21`
`22`		`- if (!Directory.Exists(appDataFolder))`
`23`		`- {`
`24`		`- Directory.CreateDirectory(appDataFolder);`
`25`		`- }`
	`22`	`+ if (!Directory.Exists(appDataFolder))`
	`23`	`+ {`
	`24`	`+ Directory.CreateDirectory(appDataFolder);`
	`25`	`+ }`
`26`	`26`
`27`		`- return Path.Combine(appDataFolder, ConfigDatabaseFile);`
	`27`	`+ return Path.Combine(appDataFolder, ConfigDatabaseFile);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`