From 4999f1948533f513f43966b7af03b3db8881645d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 7 Oct 2014 21:37:45 -0400
Subject: resolve moviedb issues

---
 .../Channels/ChannelDownloadScheduledTask.cs           | 13 ++-----------
 .../Channels/ChannelManager.cs                         | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Channels')

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index c8aa90b997..af52486089 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -212,12 +212,10 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
 
             var itemId = item.Id.ToString("N");
-            var sources = await _manager.GetChannelItemMediaSources(itemId, cancellationToken)
+            var sources = await _manager.GetChannelItemMediaSources(itemId, false, cancellationToken)
                 .ConfigureAwait(false);
 
-            var list = sources.ToList();
-
-            var cachedVersions = list.Where(i => i.Protocol == MediaProtocol.File).ToList();
+            var cachedVersions = sources.Where(i => i.Protocol == MediaProtocol.File).ToList();
 
             if (cachedVersions.Count > 0)
             {
@@ -225,13 +223,6 @@ namespace MediaBrowser.Server.Implementations.Channels
                 return;
             }
 
-            var source = list.FirstOrDefault(i => i.Protocol == MediaProtocol.Http);
-
-            if (source == null)
-            {
-                return;
-            }
-
             var channelItem = (IChannelMediaItem)item;
 
             var destination = Path.Combine(path, channelItem.ChannelId, itemId);
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 8fb6bb4343..b9d2182150 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -244,7 +244,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             return item;
         }
 
-        public async Task<IEnumerable<MediaSourceInfo>> GetChannelItemMediaSources(string id, CancellationToken cancellationToken)
+        public async Task<IEnumerable<MediaSourceInfo>> GetChannelItemMediaSources(string id, bool includeDynamicSources, CancellationToken cancellationToken)
         {
             var item = (IChannelMediaItem)_libraryManager.GetItemById(id);
 
@@ -255,7 +255,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             IEnumerable<ChannelMediaInfo> results;
 
-            if (requiresCallback != null)
+            if (requiresCallback != null && includeDynamicSources)
             {
                 results = await GetChannelItemMediaSourcesInternal(requiresCallback, item.ExternalId, cancellationToken)
                             .ConfigureAwait(false);
@@ -374,6 +374,18 @@ namespace MediaBrowser.Server.Implementations.Channels
                 Id = id
             };
 
+            var bitrate = (info.AudioBitrate ?? 0) + (info.VideoBitrate ?? 0);
+
+            if (bitrate > 0)
+            {
+                source.Bitrate = bitrate;
+            }
+
+            if (item is ChannelVideoItem && info.Protocol != MediaProtocol.Rtmp)
+            {
+                
+            }
+
             return source;
         }
 
@@ -1447,7 +1459,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             IProgress<double> progress, CancellationToken cancellationToken)
         {
             var itemId = item.Id.ToString("N");
-            var sources = await GetChannelItemMediaSources(itemId, cancellationToken)
+            var sources = await GetChannelItemMediaSources(itemId, true, cancellationToken)
                 .ConfigureAwait(false);
 
             var list = sources.Where(i => i.Protocol == MediaProtocol.Http).ToList();
-- 
cgit v1.2.3