From 17bf59dfe3bad4a1341177050c4187bbd3215800 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 10 Feb 2014 23:55:01 -0500 Subject: added toggles for metadata settings --- MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 7 ++++++- MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index b9def8e262..f25cf541b4 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -793,10 +793,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv double percent = numComplete; percent /= allChannelsList.Count; - progress.Report(90 * percent + 10); + progress.Report(80 * percent + 10); } _programs = programs.ToDictionary(i => i.Id); + + // Load these now which will prefetch metadata + await GetRecordings(new RecordingQuery(), cancellationToken).ConfigureAwait(false); + + progress.Report(100); } private double GetGuideDays(int channelCount) diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs index 6713122742..4e84693262 100644 --- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs +++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs @@ -210,7 +210,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager } catch (Exception ex) { - _logger.ErrorException("{0} failed processing WebSocket message {1}", ex, i.GetType().Name, result.MessageType); + _logger.ErrorException("{0} failed processing WebSocket message {1}", ex, i.GetType().Name, result.MessageType ?? string.Empty); } })); -- cgit v1.2.3