update startup tasks

pull/702/head
Luke Pulverenti 8 years ago
parent 512740cfb2
commit 5cfae1ada1

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

@ -1011,7 +1011,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var factorChannelWatchCount = (query.IsAiring ?? false) || (query.IsKids ?? false) || (query.IsSports ?? false) || (query.IsMovie ?? false); 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)) .ThenByDescending(i => GetRecommendationScore(i, user.Id, factorChannelWatchCount))
.ThenBy(i => i.StartDate); .ThenBy(i => i.StartDate);

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

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

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

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

Loading…
Cancel
Save