Merge pull request #465 from twpol/feature/latest-version-registry

feat: Add latest version information to registry
https://trello.com/c/6ybEXrey/508-store-latest-version-number-in-registry

Author: cjakeman

Source/ORTS.Common/SettingsStore.cs

@@ -53,6 +53,7 @@ protected static void AssertGetUserValueType(Type expectedType)
             Debug.Assert(new[] {
                 typeof(bool),
                 typeof(int),
+                typeof(long),
                 typeof(DateTime),
                 typeof(TimeSpan),
                 typeof(string),
@@ -88,6 +89,13 @@ protected static void AssertGetUserValueType(Type expectedType)
         /// <param name="value">value of the setting</param>
         public abstract void SetUserValue(string name, int value);
 
+        /// <summary>
+        /// Set a value of a user setting
+        /// </summary>
+        /// <param name="name">name of the setting</param>
+        /// <param name="value">value of the setting</param>
+        public abstract void SetUserValue(string name, long value);
+
         /// <summary>
         /// Set a value of a user setting
         /// </summary>
@@ -231,6 +239,16 @@ public override void SetUserValue(string name, int value)
             Key.SetValue(name, value, RegistryValueKind.DWord);
         }
 
+        /// <summary>
+        /// Set a value of a user setting
+        /// </summary>
+        /// <param name="name">name of the setting</param>
+        /// <param name="value">value of the setting</param>
+        public override void SetUserValue(string name, long value)
+        {
+            Key.SetValue(name, value, RegistryValueKind.QWord);
+        }
+
         /// <summary>
         /// Set a value of a user setting
         /// </summary>
@@ -390,6 +408,9 @@ public override object GetUserValue(string name, Type expectedType)
                     case "int":
                         userValue = int.Parse(Uri.UnescapeDataString(value[1]), CultureInfo.InvariantCulture);
                         break;
+                    case "long":
+                        userValue = long.Parse(Uri.UnescapeDataString(value[1]), CultureInfo.InvariantCulture);
+                        break;
                     case "DateTime":
                         userValue = DateTime.FromBinary(long.Parse(Uri.UnescapeDataString(value[1]), CultureInfo.InvariantCulture));
                         break;
@@ -440,6 +461,16 @@ public override void SetUserValue(string name, int value)
             NativeMethods.WritePrivateProfileString(Section, name, "int:" + Uri.EscapeDataString(value.ToString(CultureInfo.InvariantCulture)), FilePath);
         }
 
+        /// <summary>
+        /// Set a value of a user setting
+        /// </summary>
+        /// <param name="name">name of the setting</param>
+        /// <param name="value">value of the setting</param>
+        public override void SetUserValue(string name, long value)
+        {
+            NativeMethods.WritePrivateProfileString(Section, name, "long:" + Uri.EscapeDataString(value.ToString(CultureInfo.InvariantCulture)), FilePath);
+        }
+
         /// <summary>
         /// Set a value of a user setting
         /// </summary>

Source/ORTS.Common/VersionInfo.cs

@@ -132,5 +132,15 @@ public static Version ParseVersion(string version)
             // parsedVersion.Build will be -1 if the version only has major and minor, but we need the build number >= 0 here
             return new Version(parsedVersion.Major, parsedVersion.Minor, Math.Max(0, parsedVersion.Build), commits);
         }
+
+        public static long GetVersionLong(Version version)
+        {
+            long number = 0;
+            if (version.Major > 0) number += (long)(version.Major & 0xFFFF) << 48;
+            if (version.Minor > 0) number += (long)(version.Minor & 0xFFFF) << 32;
+            if (version.Build > 0) number += (version.Build & 0xFFFF) << 16;
+            if (version.Revision > 0) number += (version.Revision & 0xFFFF);
+            return number;
+        }
     }
 }

Source/ORTS.Updater/UpdateManager.cs

@@ -140,6 +140,13 @@ public void Check()
             if (Channel == null)
                 return;
 
+            try
+            {
+                // Update latest version details in registry
+                UpdateStoredLatestVersionNumber();
+            }
+            catch { }
+
             try
             {
                 // If we're not at the appropriate time for the next check (and we're not forced), we reconstruct the cached update/error and exit.
@@ -193,6 +200,23 @@ public void Check()
             }
         }
 
+        void UpdateStoredLatestVersionNumber()
+        {
+            if (Settings.Channel.Length > 0 && VersionInfo.Version.Length > 0)
+            {
+                var store = SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "Version");
+                var oldVersion = (long)(store.GetUserValue(Settings.Channel, typeof(long)) ?? 0L);
+                var newVersion = VersionInfo.GetVersionLong(VersionInfo.ParseVersion(VersionInfo.Version));
+                if (newVersion > oldVersion)
+                {
+                    store.SetUserValue(Settings.Channel, newVersion);
+                    store.SetUserValue(Settings.Channel + "_Version", VersionInfo.Version);
+                    store.SetUserValue(Settings.Channel + "_Build", VersionInfo.Build);
+                    store.SetUserValue(Settings.Channel + "_Updated", DateTime.UtcNow);
+                }
+            }
+        }
+
         void ValidateLastUpdate()
         {
             if (LastUpdate != null)
@@ -550,7 +574,7 @@ static string FormatCertificateForMatching(X509Certificate2 certificate)
             var commonName = subjectLines.FirstOrDefault(line => line.StartsWith("CN="));
             var country = subjectLines.FirstOrDefault(line => line.StartsWith("C="));
             return certificate.Verify() + "\n" + commonName + "\n" + country;
-         }
+        }
 
         static List<X509Certificate2> GetCertificatesFromFile(string filename)
         {