Merge pull request #1043 from MediaBrowser/dev

3.0.5557.0

6 files changed, 88 insertions, 30 deletions

diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
index dd31c5a6bd..f4d3e21d98 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
@@ -11,12 +11,6 @@ namespace MediaBrowser.Model.LiveTv
         public List<LiveTvServiceInfo> Services { get; set; }
 
         /// <summary>
-        /// Gets or sets the name of the active service.
-        /// </summary>
-        /// <value>The name of the active service.</value>
-        public string ActiveServiceName { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance is enabled.
         /// </summary>
         /// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value>
@@ -28,18 +22,6 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The enabled users.</value>
         public List<string> EnabledUsers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public LiveTvServiceStatus Status { get; set; }
-
-        /// <summary>
-        /// Gets or sets the status message.
-        /// </summary>
-        /// <value>The status message.</value>
-        public string StatusMessage { get; set; }
-
         public LiveTvInfo()
         {
             Services = new List<LiveTvServiceInfo>();
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 05fdc00b12..c6f6ed84ce 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -3,6 +3,11 @@
     public class LiveTvOptions
     {
         public int? GuideDays { get; set; }
-        public string ActiveService { get; set; }
+        public bool EnableMovieProviders { get; set; }
+
+        public LiveTvOptions()
+        {
+            EnableMovieProviders = true;
+        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index f511a7a174..06136459ff 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -95,7 +95,13 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The official rating.</value>
         public string OfficialRating { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the production year.
+        /// </summary>
+        /// <value>The production year.</value>
+        public int? ProductionYear { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the service.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index 36c06d4c08..bbd396c33f 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -7,11 +8,18 @@ namespace MediaBrowser.Model.LiveTv
     /// </summary>
     public class ProgramQuery
     {
+        public ProgramQuery()
+        {
+            ChannelIds = new string[] { };
+            SortBy = new string[] { };
+            Genres = new string[] { };
+        }
+
         /// <summary>
-        /// Gets or sets the channel identifier.
+        /// Gets or sets the channel ids.
         /// </summary>
-        /// <value>The channel identifier.</value>
-        public string[] ChannelIdList { get; set; }
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
 
         /// <summary>
         /// Gets or sets the user identifier.
@@ -19,17 +27,64 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The user identifier.</value>
         public string UserId { get; set; }
 
+        /// <summary>
+        /// The earliest date for which a program starts to return
+        /// </summary>
         public DateTime? MinStartDate { get; set; }
 
+        /// <summary>
+        /// The latest date for which a program starts to return
+        /// </summary>
         public DateTime? MaxStartDate { get; set; }
 
+        /// <summary>
+        /// The earliest date for which a program ends to return
+        /// </summary>
         public DateTime? MinEndDate { get; set; }
 
+        /// <summary>
+        /// The latest date for which a program ends to return
+        /// </summary>
         public DateTime? MaxEndDate { get; set; }
-        
-        public ProgramQuery()
-        {
-            ChannelIdList = new string[] { };
-        }
+
+        /// <summary>
+        /// Used to specific whether to return movies or not
+        /// </summary>
+        /// <remarks>If set to null, all programs will be returned</remarks>
+        public bool? IsMovie { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has aired.
+        /// </summary>
+        /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value>
+        public bool? HasAired { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// What to sort the results by
+        /// </summary>
+        /// <value>The sort by.</value>
+        public string[] SortBy { get; set; }
+
+        /// <summary>
+        /// The sort order to return results with
+        /// </summary>
+        /// <value>The sort order.</value>
+        public SortOrder? SortOrder { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific genres
+        /// </summary>
+        /// <value>The genres.</value>
+        public string[] Genres { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
index 907902123e..9ba8e0e5fc 100644
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -25,5 +25,11 @@
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is movie.
+        /// </summary>
+        /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value>
+        public bool? IsMovie { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index a6cd85d8d3..d6d6980381 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -273,6 +273,10 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The type.</value>
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the media sources.
+        /// </summary>
+        /// <value>The media sources.</value>
         public List<MediaSourceInfo> MediaSources { get; set; }
         
         public RecordingInfoDto()