channel improvements

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
index 5d133c983..1ee0bbe4a 100644
--- a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
@@ -15,6 +15,7 @@ namespace MediaBrowser.Controller.Channels
         public string ExternalId { get; set; }
 
         public string ChannelId { get; set; }
+        public string DataVersion { get; set; }
 
         public ChannelItemType ChannelItemType { get; set; }
 
@@ -28,13 +29,13 @@ namespace MediaBrowser.Controller.Channels
         
         public override string GetUserDataKey()
         {
-            if (ContentType == ChannelMediaContentType.Trailer)
+            if (ContentType == ChannelMediaContentType.MovieExtra)
             {
                 var key = this.GetProviderId(MetadataProviders.Tmdb) ?? this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Imdb) ?? this.GetProviderId(MetadataProviders.Tvcom);
 
                 if (!string.IsNullOrWhiteSpace(key))
                 {
-                    key = key + "-trailer";
+                    key = key + "-" + ExtraType.ToString().ToLower();
 
                     // Make sure different trailers have their own data.
                     if (RunTimeTicks.HasValue)
@@ -62,6 +63,11 @@ namespace MediaBrowser.Controller.Channels
             }
         }
 
+        public override bool IsSaveLocalMetadataEnabled()
+        {
+            return false;
+        }
+
         public ChannelVideoItem()
         {
             ChannelMediaSources = new List<ChannelMediaInfo>();
@@ -94,8 +100,14 @@ namespace MediaBrowser.Controller.Channels
             var info = GetItemLookupInfo<ChannelItemLookupInfo>();
 
             info.ContentType = ContentType;
+            info.ExtraType = ExtraType;
 
             return info;
         }
+
+        protected override string GetInternalMetadataPath(string basePath)
+        {
+            return System.IO.Path.Combine(basePath, "channels", ChannelId, Id.ToString("N"));
+        }
     }
 }