From 01e65c93eeeddff27fc2e0e4833678c5cc2829a0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 14 Dec 2013 20:17:57 -0500 Subject: updated live tv + nuget --- .../Configuration/BaseApplicationConfiguration.cs | 8 +- MediaBrowser.Model/LiveTv/ProgramInfoDto.cs | 7 ++ MediaBrowser.Model/LiveTv/RecordingInfoDto.cs | 7 ++ MediaBrowser.Model/LiveTv/RecordingQuery.cs | 10 ++ MediaBrowser.Model/LiveTv/RecordingStatus.cs | 9 +- MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs | 120 +++++++++++++++++++++ MediaBrowser.Model/LiveTv/TimerInfoDto.cs | 12 +++ MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + MediaBrowser.Model/System/SystemInfo.cs | 6 ++ 9 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs (limited to 'MediaBrowser.Model') 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 /// /// true if this instance is first run; otherwise, false. public bool IsStartupWizardCompleted { get; set; } - + + /// + /// Gets or sets the cache path. + /// + /// The cache path. + public string CachePath { get; set; } + /// /// Initializes a new instance of the class. /// 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 /// The episode title. public string EpisodeTitle { get; set; } + /// + /// Gets or sets the user data. + /// + /// The user data. + public UserItemDataDto UserData { get; set; } + public ProgramInfoDto() { Genres = new List(); 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 /// The audio. public ProgramAudio? Audio { get; set; } + /// + /// Gets or sets the user data. + /// + /// The user data. + public UserItemDataDto UserData { get; set; } + public RecordingInfoDto() { Genres = new List(); 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 @@ /// /// The channel identifier. public string ChannelId { get; set; } + + /// + /// Gets or sets the user identifier. + /// + /// The user identifier. + public string UserId { get; set; } } public class TimerQuery @@ -20,4 +26,8 @@ /// The channel identifier. 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 + { + /// + /// Id of the recording. + /// + public string Id { get; set; } + + /// + /// Gets or sets the external identifier. + /// + /// The external identifier. + public string ExternalId { get; set; } + + /// + /// ChannelId of the recording. + /// + public string ChannelId { get; set; } + + /// + /// Gets or sets the external channel identifier. + /// + /// The external channel identifier. + public string ExternalChannelId { get; set; } + + /// + /// ChannelName of the recording. + /// + public string ChannelName { get; set; } + + /// + /// Gets or sets the program identifier. + /// + /// The program identifier. + public string ProgramId { get; set; } + + /// + /// Gets or sets the external program identifier. + /// + /// The external program identifier. + public string ExternalProgramId { get; set; } + + /// + /// Name of the recording. + /// + public string Name { get; set; } + + /// + /// Description of the recording. + /// + public string Overview { get; set; } + + /// + /// The start date of the recording, in UTC. + /// + public DateTime StartDate { get; set; } + + /// + /// The end date of the recording, in UTC. + /// + public DateTime EndDate { get; set; } + + /// + /// Gets or sets the type of the recurrence. + /// + /// The type of the recurrence. + public RecurrenceType RecurrenceType { get; set; } + + /// + /// Gets or sets the days. + /// + /// The days. + public List Days { get; set; } + + /// + /// Gets or sets the day pattern. + /// + /// The day pattern. + public DayPattern? DayPattern { get; set; } + + /// + /// Gets or sets the priority. + /// + /// The priority. + public int Priority { get; set; } + + /// + /// Gets or sets the requested pre padding seconds. + /// + /// The requested pre padding seconds. + public int RequestedPrePaddingSeconds { get; set; } + + /// + /// Gets or sets the requested post padding seconds. + /// + /// The requested post padding seconds. + public int RequestedPostPaddingSeconds { get; set; } + + /// + /// Gets or sets the required pre padding seconds. + /// + /// The required pre padding seconds. + public int RequiredPrePaddingSeconds { get; set; } + + /// + /// Gets or sets the required post padding seconds. + /// + /// The required post padding seconds. + public int RequiredPostPaddingSeconds { get; set; } + + public SeriesTimerInfoDto() + { + Days = new List(); + } + } +} 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 @@ -20,6 +20,12 @@ namespace MediaBrowser.Model.LiveTv /// public string ChannelId { get; set; } + /// + /// Gets or sets the external channel identifier. + /// + /// The external channel identifier. + public string ExternalChannelId { get; set; } + /// /// ChannelName of the recording. /// @@ -63,6 +69,12 @@ namespace MediaBrowser.Model.LiveTv /// The series timer identifier. public string SeriesTimerId { get; set; } + /// + /// Gets or sets the external series timer identifier. + /// + /// The external series timer identifier. + public string ExternalSeriesTimerId { get; set; } + /// /// Gets or sets the requested pre padding seconds. /// 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 @@ + 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 @@ -98,6 +98,12 @@ namespace MediaBrowser.Model.System /// The items by name path. public string ItemsByNamePath { get; set; } + /// + /// Gets or sets the cache path. + /// + /// The cache path. + public string CachePath { get; set; } + /// /// Gets or sets the log path. /// -- cgit v1.2.3