1 files changed, 47 insertions, 25 deletions

diff --git a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
index 1c90a7438..8483ca904 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Implementations.Updates;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
 
@@ -17,17 +19,19 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
         private readonly IHttpClient _httpClient;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly string _releaseAssetFilename;
+        private readonly ILogger _logger;
 
-        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename)
+        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
         {
             _config = config;
             _appHost = appHost;
             _httpClient = httpClient;
             _jsonSerializer = jsonSerializer;
             _releaseAssetFilename = releaseAssetFilename;
+            _logger = logger;
         }
 
-        public async void Run()
+        public async Task Run()
         {
             var lastVersion = _config.Configuration.LastVersion;
             var currentVersion = _appHost.ApplicationVersion;
@@ -41,35 +45,47 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
             {
                 var updateLevel = _config.Configuration.SystemUpdateLevel;
 
-                if (updateLevel == PackageVersionClass.Dev)
-                {
-                    // It's already dev, there's nothing to check
-                    return;
-                }
-
                 await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
             }
-            catch
+            catch (Exception ex)
             {
-
+                _logger.ErrorException("Error in update migration", ex);
             }
         }
 
-        private async Task CheckVersion(Version currentVersion, PackageVersionClass updateLevel, CancellationToken cancellationToken)
+        private async Task CheckVersion(Version currentVersion, PackageVersionClass currentUpdateLevel, CancellationToken cancellationToken)
         {
-            var releases = await new GithubUpdater(_httpClient, _jsonSerializer, TimeSpan.FromMinutes(3))
+            var releases = await new GithubUpdater(_httpClient, _jsonSerializer)
                 .GetLatestReleases("MediaBrowser", "Emby", _releaseAssetFilename, cancellationToken).ConfigureAwait(false);
 
-            var newUpdateLevel = updateLevel;
+            var newUpdateLevel = GetNewUpdateLevel(currentVersion, currentUpdateLevel, releases);
+
+            if (newUpdateLevel != currentUpdateLevel)
+            {
+                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
+                _config.SaveConfiguration();
+            }
+        }
+
+        private PackageVersionClass GetNewUpdateLevel(Version currentVersion, PackageVersionClass currentUpdateLevel, List<GithubUpdater.RootObject> releases)
+        {
+            var newUpdateLevel = currentUpdateLevel;
 
             // If the current version is later than current stable, set the update level to beta
             if (releases.Count >= 1)
             {
                 var release = releases[0];
                 var version = ParseVersion(release.tag_name);
-                if (version != null && currentVersion > version)
+                if (version != null)
                 {
-                    newUpdateLevel = PackageVersionClass.Beta;
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Beta;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Release;
+                    }
                 }
             }
 
@@ -78,25 +94,31 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
             {
                 var release = releases[1];
                 var version = ParseVersion(release.tag_name);
-                if (version != null && currentVersion > version)
+                if (version != null)
                 {
-                    newUpdateLevel = PackageVersionClass.Dev;
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Dev;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Beta;
+                    }
                 }
             }
 
-            if (newUpdateLevel != updateLevel)
-            {
-                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
-                _config.SaveConfiguration();
-            }
+            return newUpdateLevel;
         }
 
         private Version ParseVersion(string versionString)
         {
-            var parts = versionString.Split('.');
-            if (parts.Length == 3)
+            if (!string.IsNullOrWhiteSpace(versionString))
             {
-                versionString += ".0";
+                var parts = versionString.Split('.');
+                if (parts.Length == 3)
+                {
+                    versionString += ".0";
+                }
             }
 
             Version version;