Display specials within seasons

5 files changed, 82 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 1d50a5933..bfa751756 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -31,6 +31,12 @@ namespace MediaBrowser.Model.Dto
         public DateTime? DateCreated { get; set; }
 
         /// <summary>
+        /// Gets or sets the special season number.
+        /// </summary>
+        /// <value>The special season number.</value>
+        public int? SpecialSeasonNumber { get; set; }
+        
+        /// <summary>
         /// Gets or sets the name of the sort.
         /// </summary>
         /// <value>The name of the sort.</value>
diff --git a/MediaBrowser.Model/LiveTv/ChannelGuide.cs b/MediaBrowser.Model/LiveTv/ChannelGuide.cs
new file mode 100644
index 000000000..d2bebac18
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/ChannelGuide.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.LiveTv
+{
+    public class ChannelGuide
+    {
+        /// <summary>
+        /// Gets or sets the name of the service.
+        /// </summary>
+        /// <value>The name of the service.</value>
+        public string ServiceName { get; set; }
+
+        /// <summary>
+        /// ChannelId for the EPG.
+        /// </summary>
+        public string ChannelId { get; set; }
+
+        /// <summary>
+        /// List of all the programs for a specific channel
+        /// </summary>
+        public List<ProgramInfo> Programs { get; set; } 
+    }
+}
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfo.cs b/MediaBrowser.Model/LiveTv/ProgramInfo.cs
new file mode 100644
index 000000000..6bf0e383f
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/ProgramInfo.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace MediaBrowser.Model.LiveTv
+{
+    public class ProgramInfo
+    {
+        /// <summary>
+        /// Id of the program.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Name of the program
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Description of the progam.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The start date of the program, in UTC.
+        /// </summary>
+        public DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// The end date of the program, in UTC.
+        /// </summary>
+        public DateTime EndDate { get; set; }
+
+        /// <summary>
+        /// Genre of the program.
+        /// </summary>
+        public string Genre { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
new file mode 100644
index 000000000..e7a91f4d5
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.LiveTv
+{
+    /// <summary>
+    /// Class RecordingQuery.
+    /// </summary>
+    public class RecordingQuery
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has recorded.
+        /// </summary>
+        /// <value><c>null</c> if [has recorded] contains no value, <c>true</c> if [has recorded]; otherwise, <c>false</c>.</value>
+        public bool? HasRecorded { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs
index 13720ea2b..14c946ba1 100644
--- a/MediaBrowser.Model/Querying/ItemQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemQuery.cs
@@ -265,6 +265,8 @@ namespace MediaBrowser.Model.Querying
         public double? MinCommunityRating { get; set; }
         public double? MinCriticRating { get; set; }
 
+        public int? AiredDuringSeason { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemQuery" /> class.
         /// </summary>