1 files changed, 55 insertions, 37 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 12aa670b3..23c1522b5 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -547,7 +547,8 @@ namespace MediaBrowser.Server.Implementations.Channels
                 SupportsLatestMedia = supportsLatest,
                 Name = channel.Name,
                 Id = channel.Id.ToString("N"),
-                SupportsContentDownloading = isIndexable || supportsLatest
+                SupportsContentDownloading = isIndexable || supportsLatest,
+                AutoRefreshLevels = features.AutoRefreshLevels
             };
         }
 
@@ -627,6 +628,13 @@ namespace MediaBrowser.Server.Implementations.Channels
 
                 items = items.Where(i => contentTypes.Contains(i.Item2.ContentType));
             }
+            if (query.ExtraTypes.Length > 0)
+            {
+                // Avoid implicitly captured closure
+                var contentTypes = query.ExtraTypes;
+
+                items = items.Where(i => contentTypes.Contains(i.Item2.ExtraType));
+            }
 
             // Avoid implicitly captured closure
             var token = cancellationToken;
@@ -776,6 +784,13 @@ namespace MediaBrowser.Server.Implementations.Channels
 
                 items = items.Where(i => contentTypes.Contains(i.Item2.ContentType));
             }
+            if (query.ExtraTypes.Length > 0)
+            {
+                // Avoid implicitly captured closure
+                var contentTypes = query.ExtraTypes;
+
+                items = items.Where(i => contentTypes.Contains(i.Item2.ExtraType));
+            }
 
             if (query.StartIndex.HasValue)
             {
@@ -806,7 +821,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 Items = returnItemArray
             };
         }
-        
+
         public async Task<QueryResult<BaseItemDto>> GetAllMedia(AllChannelMediaQuery query, CancellationToken cancellationToken)
         {
             var user = string.IsNullOrWhiteSpace(query.UserId)
@@ -1161,60 +1176,62 @@ namespace MediaBrowser.Server.Implementations.Channels
             };
         }
 
-        private string GetIdToHash(string externalId, IChannel channelProvider)
+        private string GetIdToHash(string externalId, string channelName)
         {
             // Increment this as needed to force new downloads
             // Incorporate Name because it's being used to convert channel entity to provider
-            return externalId + (channelProvider.DataVersion ?? string.Empty) +
-                (channelProvider.Name ?? string.Empty) + "16";
+            return externalId + (channelName ?? string.Empty) + "16";
         }
 
-        private async Task<BaseItem> GetChannelItemEntity(ChannelItemInfo info, IChannel channelProvider, Guid internalChannelId, CancellationToken cancellationToken)
+        private T GetItemById<T>(string idString, string channelName, string channnelDataVersion, out bool isNew)
+            where T : BaseItem, IChannelItem, new()
         {
-            BaseItem item;
-            Guid id;
-            var isNew = false;
+            var id = GetIdToHash(idString, channelName).GetMBId(typeof(T));
 
-            var idToHash = GetIdToHash(info.Id, channelProvider);
+            T item = null;
 
-            if (info.Type == ChannelItemType.Folder)
+            try
             {
-                id = idToHash.GetMBId(typeof(ChannelFolderItem));
-
-                item = _libraryManager.GetItemById(id) as ChannelFolderItem;
-
-                if (item == null)
-                {
-                    isNew = true;
-                    item = new ChannelFolderItem();
-                }
+                item = _libraryManager.GetItemById(id) as T;
             }
-            else if (info.MediaType == ChannelMediaType.Audio)
+            catch (Exception ex)
             {
-                id = idToHash.GetMBId(typeof(ChannelAudioItem));
-
-                item = _libraryManager.GetItemById(id) as ChannelAudioItem;
+                _logger.ErrorException("Error retrieving channel item from database", ex);
+            }
 
-                if (item == null)
-                {
-                    isNew = true;
-                    item = new ChannelAudioItem();
-                }
+            if (item == null || !string.Equals(item.DataVersion, channnelDataVersion, StringComparison.Ordinal))
+            {
+                item = new T();
+                isNew = true;
             }
             else
             {
-                id = idToHash.GetMBId(typeof(ChannelVideoItem));
+                isNew = false;
+            }
 
-                item = _libraryManager.GetItemById(id) as ChannelVideoItem;
+            item.DataVersion = channnelDataVersion;
+            item.Id = id;
+            return item;
+        }
 
-                if (item == null)
-                {
-                    isNew = true;
-                    item = new ChannelVideoItem();
-                }
+        private async Task<BaseItem> GetChannelItemEntity(ChannelItemInfo info, IChannel channelProvider, Guid internalChannelId, CancellationToken cancellationToken)
+        {
+            BaseItem item;
+            bool isNew;
+
+            if (info.Type == ChannelItemType.Folder)
+            {
+                item = GetItemById<ChannelFolderItem>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+            }
+            else if (info.MediaType == ChannelMediaType.Audio)
+            {
+                item = GetItemById<ChannelAudioItem>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+            }
+            else
+            {
+                item = GetItemById<ChannelVideoItem>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
             }
 
-            item.Id = id;
             item.RunTimeTicks = info.RunTimeTicks;
 
             if (isNew)
@@ -1254,6 +1271,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             if (channelMediaItem != null)
             {
                 channelMediaItem.ContentType = info.ContentType;
+                channelMediaItem.ExtraType = info.ExtraType;
                 channelMediaItem.ChannelMediaSources = info.MediaSources;
 
                 var mediaSource = info.MediaSources.FirstOrDefault();