support deleting and canceling live tv recordings and timers

4 files changed, 29 insertions, 21 deletions

diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index b8af8f6e2..778977340 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -10,4 +10,11 @@ namespace MediaBrowser.Model.LiveTv
         Conflicted,
         Deleted
     }
+
+    public enum RecurrenceType
+    {
+        Manual,
+        NewProgramEvents,
+        AllProgramEvents
+    }
 }
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index 6a8339031..ddefce59e 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Model.LiveTv
 {
     public class TimerInfoDto
     {
-          /// <summary>
+        /// <summary>
         /// Id of the recording.
         /// </summary>
         public string Id { get; set; }
@@ -15,7 +14,7 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The external identifier.</value>
         public string ExternalId { get; set; }
-        
+
         /// <summary>
         /// ChannelId of the recording.
         /// </summary>
@@ -27,6 +26,12 @@ namespace MediaBrowser.Model.LiveTv
         public string ChannelName { get; set; }
 
         /// <summary>
+        /// Gets or sets the program identifier.
+        /// </summary>
+        /// <value>The program identifier.</value>
+        public string ProgramId { get; set; }
+
+        /// <summary>
         /// Name of the recording.
         /// </summary>
         public string Name { get; set; }
@@ -57,16 +62,5 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is recurring; otherwise, <c>false</c>.</value>
         public bool IsRecurring { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recurring days.
-        /// </summary>
-        /// <value>The recurring days.</value>
-        public List<DayOfWeek> RecurringDays { get; set; }
-
-        public TimerInfoDto()
-        {
-            RecurringDays = new List<DayOfWeek>();
-        }
-  }
+    }
 }
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index 406ac9844..56c50da7f 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Entities;
-
+
 namespace MediaBrowser.Model.Querying
 {
     public class EpisodeQuery
@@ -8,7 +7,9 @@ namespace MediaBrowser.Model.Querying
 
         public string SeriesId { get; set; }
 
-        public LocationType[] ExcludeLocationTypes { get; set; }
+        public bool? IsMissing { get; set; }
+
+        public bool? IsVirtualUnaired { get; set; }
 
         public int? SeasonNumber { get; set; }
 
@@ -17,7 +18,6 @@ namespace MediaBrowser.Model.Querying
         public EpisodeQuery()
         {
             Fields = new ItemFields[] { };
-            ExcludeLocationTypes = new LocationType[] { };
         }
     }
 
@@ -27,7 +27,9 @@ namespace MediaBrowser.Model.Querying
 
         public string SeriesId { get; set; }
 
-        public LocationType[] ExcludeLocationTypes { get; set; }
+        public bool? IsMissing { get; set; }
+
+        public bool? IsVirtualUnaired { get; set; }
 
         public ItemFields[] Fields { get; set; }
 
@@ -36,7 +38,6 @@ namespace MediaBrowser.Model.Querying
         public SeasonQuery()
         {
             Fields = new ItemFields[] { };
-            ExcludeLocationTypes = new LocationType[] { };
         }
     }
 }
diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs
index dee4fea7f..a7d500303 100644
--- a/MediaBrowser.Model/Tasks/TaskInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskInfo.cs
@@ -57,6 +57,12 @@ namespace MediaBrowser.Model.Tasks
         public string Category { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether this instance is hidden.
+        /// </summary>
+        /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
+        public bool IsHidden { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TaskInfo"/> class.
         /// </summary>
         public TaskInfo()