Merge pull request #2151 from MediaBrowser/beta

Beta

2 files changed, 34 insertions, 61 deletions

diff --git a/MediaBrowser.Server.Startup.Common/Migrations/OmdbEpisodeProviderMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/OmdbEpisodeProviderMigration.cs
deleted file mode 100644
index ebc0e67de..000000000
--- a/MediaBrowser.Server.Startup.Common/Migrations/OmdbEpisodeProviderMigration.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using MediaBrowser.Controller.Configuration;
-using System.Linq;
-
-namespace MediaBrowser.Server.Startup.Common.Migrations
-{
-    class OmdbEpisodeProviderMigration : IVersionMigration
-    {
-        private readonly IServerConfigurationManager _config;
-        private const string _providerName = "The Open Movie Database";
-
-        public OmdbEpisodeProviderMigration(IServerConfigurationManager config)
-        {
-            _config = config;
-        }
-
-        public void Run()
-        {
-            var migrationKey = this.GetType().FullName;
-            var migrationKeyList = _config.Configuration.Migrations.ToList();
-
-            if (!migrationKeyList.Contains(migrationKey))
-            {
-                foreach (var metaDataOption in _config.Configuration.MetadataOptions)
-                {
-                    if (metaDataOption.ItemType == "Episode")
-                    {
-                        var disabledFetchers = metaDataOption.DisabledMetadataFetchers.ToList();
-                        if (!disabledFetchers.Contains(_providerName))
-                        {
-                            disabledFetchers.Add(_providerName);
-                            metaDataOption.DisabledMetadataFetchers = disabledFetchers.ToArray();
-                        }
-                    }
-                }
-
-                migrationKeyList.Add(migrationKey);
-                _config.Configuration.Migrations = migrationKeyList.ToArray();
-                _config.SaveConfiguration();
-            }
-
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
index ec00fb33d..4afd5bd34 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Implementations.Updates;
@@ -41,12 +42,6 @@ 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
@@ -55,21 +50,39 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
             }
         }
 
-        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(5))
+            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,17 +91,20 @@ 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)