瀏覽代碼

update startup tasks

Luke Pulverenti 8 年之前
父節點
當前提交
5cfae1ada1

+ 2 - 2
MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -602,7 +602,7 @@ namespace MediaBrowser.Model.Dlna
 
         private int GetAudioBitrate(string subProtocol, int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
         {
-            var defaultBitrate = audioStream == null ? 192000 : audioStream.BitRate ?? 192000;
+            int defaultBitrate = audioStream == null ? 192000 : audioStream.BitRate ?? 192000;
             // Reduce the bitrate if we're downmixing
             if (targetAudioChannels.HasValue && audioStream != null && audioStream.Channels.HasValue && targetAudioChannels.Value < audioStream.Channels.Value)
             {
@@ -615,7 +615,7 @@ namespace MediaBrowser.Model.Dlna
                 {
                     if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
                     {
-                        if (string.Equals(subProtocol, "hls", StringComparison.OrdinalIgnoreCase))
+                        if (StringHelper.EqualsIgnoreCase(subProtocol, "hls"))
                         {
                             defaultBitrate = Math.Max(384000, defaultBitrate);
                         }

+ 1 - 1
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -1011,7 +1011,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var factorChannelWatchCount = (query.IsAiring ?? false) || (query.IsKids ?? false) || (query.IsSports ?? false) || (query.IsMovie ?? false);
 
-            programs = programList.OrderBy(i => i.HasImage(ImageType.Primary) ? 0 : 1)
+            programs = programList.OrderBy(i => i.StartDate.Date)
                 .ThenByDescending(i => GetRecommendationScore(i, user.Id, factorChannelWatchCount))
                 .ThenBy(i => i.StartDate);
 

+ 5 - 5
MediaBrowser.Server.Startup.Common/ApplicationHost.cs

@@ -315,6 +315,8 @@ namespace MediaBrowser.Server.Startup.Common
         /// </summary>
         public override async Task RunStartupTasks()
         {
+            await PerformPreInitMigrations().ConfigureAwait(false);
+
             if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
                 ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
             {
@@ -366,23 +368,21 @@ namespace MediaBrowser.Server.Startup.Common
             HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
             HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
 
-            PerformPreInitMigrations();
-
             return base.Init(progress);
         }
 
-        private void PerformPreInitMigrations()
+        private async Task PerformPreInitMigrations()
         {
             var migrations = new List<IVersionMigration>
             {
-                new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
+                new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename, Logger)
             };
 
             foreach (var task in migrations)
             {
                 try
                 {
-                    task.Run();
+                    await task.Run().ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {

+ 1 - 1
MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs

@@ -16,7 +16,7 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
             _taskManager = taskManager;
         }
 
-        public void Run()
+        public async Task Run()
         {
             // If a forced migration is required, do that now
             if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)

+ 3 - 2
MediaBrowser.Server.Startup.Common/Migrations/IVersionMigration.cs

@@ -1,8 +1,9 @@
-
+using System.Threading.Tasks;
+
 namespace MediaBrowser.Server.Startup.Common.Migrations
 {
     public interface IVersionMigration
     {
-        void Run();
+        Task Run();
     }
 }

+ 2 - 1
MediaBrowser.Server.Startup.Common/Migrations/MovieDbEpisodeProviderMigration.cs

@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Startup.Common.Migrations
 {
@@ -13,7 +14,7 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
             _config = config;
         }
 
-        public void Run()
+        public async Task Run()
         {
             var migrationKey = this.GetType().FullName;
             var migrationKeyList = _config.Configuration.Migrations.ToList();