9 files changed, 178 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index b99fefcca..19620890e 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -43,7 +43,13 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if this instance is first run; otherwise, <c>false</c>.</value>
         public bool IsStartupWizardCompleted { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the cache path.
+        /// </summary>
+        /// <value>The cache path.</value>
+        public string CachePath { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index a330c6c3a..b3542fcf8 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -101,6 +102,12 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The episode title.</value>
         public string EpisodeTitle { get; set; }
 
+        /// <summary>
+        /// Gets or sets the user data.
+        /// </summary>
+        /// <value>The user data.</value>
+        public UserItemDataDto UserData { get; set; }
+
         public ProgramInfoDto()
         {
             Genres = new List<string>();
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index a095e1751..d17ebee6d 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -123,6 +124,12 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The audio.</value>
         public ProgramAudio? Audio { get; set; }
 
+        /// <summary>
+        /// Gets or sets the user data.
+        /// </summary>
+        /// <value>The user data.</value>
+        public UserItemDataDto UserData { get; set; }
+
         public RecordingInfoDto()
         {
             Genres = new List<string>();
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index cd5ebe628..3aa94ff83 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -10,6 +10,12 @@
         /// </summary>
         /// <value>The channel identifier.</value>
         public string ChannelId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
     }
 
     public class TimerQuery
@@ -20,4 +26,8 @@
         /// <value>The channel identifier.</value>
         public string ChannelId { get; set; }
     }
+
+    public class SeriesTimerQuery
+    {
+    }
 }
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 5334d75a3..06bc98e63 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Model.LiveTv
         Scheduled,
         InProgress,
         Completed,
-        Abored,
+        Aborted,
         Cancelled,
         ConflictedOk,
         ConflictedNotOk,
@@ -22,4 +22,11 @@ namespace MediaBrowser.Model.LiveTv
         NewProgramEventsAllChannels,
         AllProgramEventsAllChannels
     }
+
+    public enum DayPattern
+    {
+        Daily,
+        Weekdays,
+        Weekends
+    }
 }
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
new file mode 100644
index 000000000..3862c0745
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.LiveTv
+{
+    public class SeriesTimerInfoDto
+    {
+        /// <summary>
+        /// Id of the recording.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external identifier.
+        /// </summary>
+        /// <value>The external identifier.</value>
+        public string ExternalId { get; set; }
+        
+        /// <summary>
+        /// ChannelId of the recording.
+        /// </summary>
+        public string ChannelId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external channel identifier.
+        /// </summary>
+        /// <value>The external channel identifier.</value>
+        public string ExternalChannelId { get; set; }
+        
+        /// <summary>
+        /// ChannelName of the recording.
+        /// </summary>
+        public string ChannelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the program identifier.
+        /// </summary>
+        /// <value>The program identifier.</value>
+        public string ProgramId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external program identifier.
+        /// </summary>
+        /// <value>The external program identifier.</value>
+        public string ExternalProgramId { get; set; }
+        
+        /// <summary>
+        /// Name of the recording.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Description of the recording.
+        /// </summary>
+        public string Overview { get; set; }
+
+        /// <summary>
+        /// The start date of the recording, in UTC.
+        /// </summary>
+        public DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// The end date of the recording, in UTC.
+        /// </summary>
+        public DateTime EndDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the recurrence.
+        /// </summary>
+        /// <value>The type of the recurrence.</value>
+        public RecurrenceType RecurrenceType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the days.
+        /// </summary>
+        /// <value>The days.</value>
+        public List<DayOfWeek> Days { get; set; }
+
+        /// <summary>
+        /// Gets or sets the day pattern.
+        /// </summary>
+        /// <value>The day pattern.</value>
+        public DayPattern? DayPattern { get; set; }
+
+        /// <summary>
+        /// Gets or sets the priority.
+        /// </summary>
+        /// <value>The priority.</value>
+        public int Priority { get; set; }
+
+        /// <summary>
+        /// Gets or sets the requested pre padding seconds.
+        /// </summary>
+        /// <value>The requested pre padding seconds.</value>
+        public int RequestedPrePaddingSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the requested post padding seconds.
+        /// </summary>
+        /// <value>The requested post padding seconds.</value>
+        public int RequestedPostPaddingSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the required pre padding seconds.
+        /// </summary>
+        /// <value>The required pre padding seconds.</value>
+        public int RequiredPrePaddingSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the required post padding seconds.
+        /// </summary>
+        /// <value>The required post padding seconds.</value>
+        public int RequiredPostPaddingSeconds { get; set; }
+
+        public SeriesTimerInfoDto()
+        {
+            Days = new List<DayOfWeek>();
+        }
+    }
+}
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index b9a7e369a..6b7ab42d3 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -21,6 +21,12 @@ namespace MediaBrowser.Model.LiveTv
         public string ChannelId { get; set; }
 
         /// <summary>
+        /// Gets or sets the external channel identifier.
+        /// </summary>
+        /// <value>The external channel identifier.</value>
+        public string ExternalChannelId { get; set; }
+        
+        /// <summary>
         /// ChannelName of the recording.
         /// </summary>
         public string ChannelName { get; set; }
@@ -64,6 +70,12 @@ namespace MediaBrowser.Model.LiveTv
         public string SeriesTimerId { get; set; }
 
         /// <summary>
+        /// Gets or sets the external series timer identifier.
+        /// </summary>
+        /// <value>The external series timer identifier.</value>
+        public string ExternalSeriesTimerId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the requested pre padding seconds.
         /// </summary>
         /// <value>The requested pre padding seconds.</value>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 4dfa0ec64..071f5bdde 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -77,6 +77,7 @@
     <Compile Include="LiveTv\ProgramQuery.cs" />
     <Compile Include="LiveTv\RecordingQuery.cs" />
     <Compile Include="LiveTv\RecordingStatus.cs" />
+    <Compile Include="LiveTv\SeriesTimerInfoDto.cs" />
     <Compile Include="LiveTv\TimerInfoDto.cs" />
     <Compile Include="Providers\ImageProviderInfo.cs" />
     <Compile Include="Providers\RemoteImageInfo.cs" />
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index ade4e96fd..d475517dc 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -99,6 +99,12 @@ namespace MediaBrowser.Model.System
         public string ItemsByNamePath { get; set; }
 
         /// <summary>
+        /// Gets or sets the cache path.
+        /// </summary>
+        /// <value>The cache path.</value>
+        public string CachePath { get; set; }
+        
+        /// <summary>
         /// Gets or sets the log path.
         /// </summary>
         /// <value>The log path.</value>