Merge pull request #2224 from MediaBrowser/beta

Beta

9 files changed, 97 insertions, 9 deletions

diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index 4d863c6eb..7e93a130b 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -10,6 +10,8 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         public string Id { get; set; }
 
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or sets the server identifier.
         /// </summary>
@@ -105,5 +107,6 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
         public bool IsPostPaddingRequired { get; set; }
+        public KeepUntil KeepUntil { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index 0ece1e4a0..4505b80a0 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -1,4 +1,5 @@
-
+using MediaBrowser.Model.Entities;
+
 namespace MediaBrowser.Model.LiveTv
 {
     /// <summary>
@@ -61,9 +62,42 @@ namespace MediaBrowser.Model.LiveTv
         public bool AddCurrentProgram { get; set; }
         public bool EnableUserData { get; set; }
 
+        /// <summary>
+        /// Used to specific whether to return news or not
+        /// </summary>
+        /// <remarks>If set to null, all programs will be returned</remarks>
+        public bool? IsNews { get; set; }
+
+        /// <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>
+        /// Gets or sets a value indicating whether this instance is kids.
+        /// </summary>
+        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
+        public bool? IsKids { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is sports.
+        /// </summary>
+        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
+        public bool? IsSports { get; set; }
+        public bool? IsSeries { get; set; }
+
+        public string[] SortBy { get; set; }
+
+        /// <summary>
+        /// The sort order to return results with
+        /// </summary>
+        /// <value>The sort order.</value>
+        public SortOrder? SortOrder { get; set; }
+
         public LiveTvChannelQuery()
         {
             EnableUserData = true;
+            SortBy = new string[] { };
         }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index bf459237a..ad57d1473 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -41,6 +41,7 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The user identifier.</value>
         public string UserId { get; set; }
+        public string SeriesTimerId { get; set; }
 
         /// <summary>
         /// The earliest date for which a program starts to return
@@ -63,6 +64,12 @@ namespace MediaBrowser.Model.LiveTv
         public DateTime? MaxEndDate { get; set; }
 
         /// <summary>
+        /// Used to specific whether to return news or not
+        /// </summary>
+        /// <remarks>If set to null, all programs will be returned</remarks>
+        public bool? IsNews { get; set; }
+
+        /// <summary>
         /// Used to specific whether to return movies or not
         /// </summary>
         /// <remarks>If set to null, all programs will be returned</remarks>
@@ -83,6 +90,7 @@ namespace MediaBrowser.Model.LiveTv
         /// Skips over a given number of items within the results. Use for paging.
         /// </summary>
         public int? StartIndex { get; set; }
+        public bool? IsSeries { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance has aired.
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
index 0e6d081a1..4bc506bf6 100644
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -49,7 +49,13 @@ namespace MediaBrowser.Model.LiveTv
         /// 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? IsNews { 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; }
+        public bool? IsSeries { get; set; }
         /// <summary>
         /// Gets or sets a value indicating whether this instance is kids.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 0ba5f1779..265aad335 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -68,6 +68,7 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The fields.</value>
         public ItemFields[] Fields { get; set; }
         public bool? EnableImages { get; set; }
+        public bool? IsNews { get; set; }
         public bool? IsMovie { get; set; }
         public bool? IsSeries { get; set; }
         public bool? IsKids { get; set; }
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 7ab716c4d..571ff9c99 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -7,7 +7,6 @@ namespace MediaBrowser.Model.LiveTv
         Scheduled,
         InProgress,
         Completed,
-        Aborted,
         Cancelled,
         ConflictedOk,
         ConflictedNotOk,
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 4b88e42f3..997b090ff 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -12,18 +12,29 @@ namespace MediaBrowser.Model.LiveTv
     [DebuggerDisplay("Name = {Name}")]
     public class SeriesTimerInfoDto : BaseTimerInfoDto
     {
+        public SeriesTimerInfoDto()
+        {
+            ImageTags = new Dictionary<ImageType, string>();
+            Days = new List<DayOfWeek>();
+            Type = "SeriesTimer";
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether [record any time].
         /// </summary>
         /// <value><c>true</c> if [record any time]; otherwise, <c>false</c>.</value>
         public bool RecordAnyTime { get; set; }
 
+        public bool SkipEpisodesInLibrary { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [record any channel].
         /// </summary>
         /// <value><c>true</c> if [record any channel]; otherwise, <c>false</c>.</value>
         public bool RecordAnyChannel { get; set; }
 
+        public int KeepUpTo { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [record new only].
         /// </summary>
@@ -58,10 +69,36 @@ namespace MediaBrowser.Model.LiveTv
             get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Primary); }
         }
 
-        public SeriesTimerInfoDto()
-        {
-            ImageTags = new Dictionary<ImageType, string>();
-            Days = new List<DayOfWeek>();
-        }
+        /// <summary>
+        /// Gets or sets the parent thumb item id.
+        /// </summary>
+        /// <value>The parent thumb item id.</value>
+        public string ParentThumbItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parent thumb image tag.
+        /// </summary>
+        /// <value>The parent thumb image tag.</value>
+        public string ParentThumbImageTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parent primary image item identifier.
+        /// </summary>
+        /// <value>The parent primary image item identifier.</value>
+        public string ParentPrimaryImageItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parent primary image tag.
+        /// </summary>
+        /// <value>The parent primary image tag.</value>
+        public string ParentPrimaryImageTag { get; set; }
+    }
+
+    public enum KeepUntil
+    {
+        UntilDeleted,
+        UntilSpaceNeeded,
+        UntilWatched,
+        UntilDate
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index a95678fae..d1aa3118f 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -27,8 +27,6 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The external series timer identifier.</value>
         public string ExternalSeriesTimerId { get; set; }
 
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or sets the run time ticks.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs
index 87b6b89ac..310dc486f 100644
--- a/MediaBrowser.Model/LiveTv/TimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs
@@ -15,5 +15,7 @@
         public string SeriesTimerId { get; set; }
 
         public bool? IsActive { get; set; }
+
+        public bool? IsScheduled { get; set; }
     }
 }
\ No newline at end of file