added IHasImages and IHasUserData

4 files changed, 36 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 62688cdc4..58f8b4e05 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -252,8 +252,8 @@ namespace MediaBrowser.Model.Configuration
             EnableVideoImageExtraction = true;
 
             EnableMovieChapterImageExtraction = true;
-            EnableEpisodeChapterImageExtraction = true;
-            EnableOtherVideoChapterImageExtraction = true;
+            EnableEpisodeChapterImageExtraction = false;
+            EnableOtherVideoChapterImageExtraction = false;
 
 #if (DEBUG)
             EnableDeveloperTools = true;
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 0c4eb28c5..7a55282cc 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -109,6 +110,12 @@ namespace MediaBrowser.Model.LiveTv
         public string EpisodeTitle { get; set; }
 
         /// <summary>
+        /// Gets or sets the image tags.
+        /// </summary>
+        /// <value>The image tags.</value>
+        public Dictionary<ImageType, Guid> ImageTags { get; set; }
+        
+        /// <summary>
         /// Gets or sets the user data.
         /// </summary>
         /// <value>The user data.</value>
@@ -132,9 +139,16 @@ namespace MediaBrowser.Model.LiveTv
         /// <value><c>true</c> if this instance is series; otherwise, <c>false</c>.</value>
         public bool IsSeries { get; set; }
 
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public string Type { get; set; }
+
         public ProgramInfoDto()
         {
             Genres = new List<string>();
+            ImageTags = new Dictionary<ImageType, Guid>();
         }
     }
 
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 2f836dc4d..16ced7c2c 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -137,14 +138,27 @@ namespace MediaBrowser.Model.LiveTv
         public ProgramAudio? Audio { get; set; }
 
         /// <summary>
+        /// Gets or sets the image tags.
+        /// </summary>
+        /// <value>The image tags.</value>
+        public Dictionary<ImageType, Guid> ImageTags { get; set; }
+        
+        /// <summary>
         /// Gets or sets the user data.
         /// </summary>
         /// <value>The user data.</value>
         public UserItemDataDto UserData { get; set; }
 
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public string Type { get; set; }
+
         public RecordingInfoDto()
         {
             Genres = new List<string>();
+            ImageTags = new Dictionary<ImageType, Guid>();
         }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 3aa94ff83..20a7074a5 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -16,6 +16,12 @@
         /// </summary>
         /// <value>The user identifier.</value>
         public string UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
     }
 
     public class TimerQuery