aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ImageDownloadOptions.cs (renamed from MediaBrowser.Model/Entities/ImageDownloadOptions.cs)18
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs79
-rw-r--r--MediaBrowser.Model/Configuration/UserConfiguration.cs7
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs11
-rw-r--r--MediaBrowser.Model/Entities/MetadataFields.cs14
-rw-r--r--MediaBrowser.Model/LiveTv/ChannelInfoDto.cs6
-rw-r--r--MediaBrowser.Model/LiveTv/ProgramInfoDto.cs85
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingInfoDto.cs80
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingQuery.cs6
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingStatus.cs9
-rw-r--r--MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs48
-rw-r--r--MediaBrowser.Model/LiveTv/TimerInfoDto.cs56
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj7
-rw-r--r--MediaBrowser.Model/Search/SearchHint.cs6
-rw-r--r--MediaBrowser.Model/Session/SessionInfoDto.cs6
-rw-r--r--MediaBrowser.Model/packages.config2
16 files changed, 343 insertions, 97 deletions
diff --git a/MediaBrowser.Model/Entities/ImageDownloadOptions.cs b/MediaBrowser.Model/Configuration/ImageDownloadOptions.cs
index 92e989a34..603112110 100644
--- a/MediaBrowser.Model/Entities/ImageDownloadOptions.cs
+++ b/MediaBrowser.Model/Configuration/ImageDownloadOptions.cs
@@ -1,5 +1,5 @@

-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Configuration
{
/// <summary>
/// Class ImageDownloadOptions
@@ -62,4 +62,20 @@ namespace MediaBrowser.Model.Entities
Banner = true;
}
}
+
+ /// <summary>
+ /// Class MetadataOptions.
+ /// </summary>
+ public class MetadataOptions
+ {
+ public int MaxBackdrops { get; set; }
+
+ public int MinBackdropWidth { get; set; }
+
+ public MetadataOptions()
+ {
+ MaxBackdrops = 3;
+ MinBackdropWidth = 1280;
+ }
+ }
}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 1f75969be..c8c205404 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Weather;
+using MediaBrowser.Model.Weather;
using System;
namespace MediaBrowser.Model.Configuration
@@ -88,12 +87,6 @@ namespace MediaBrowser.Model.Configuration
public string MetadataCountryCode { get; set; }
/// <summary>
- /// Gets or sets the max backdrops.
- /// </summary>
- /// <value>The max backdrops.</value>
- public int MaxBackdrops { get; set; }
-
- /// <summary>
/// Options for specific art to download for movies.
/// </summary>
public ImageDownloadOptions DownloadMovieImages { get; set; }
@@ -143,12 +136,6 @@ namespace MediaBrowser.Model.Configuration
public bool ShowLogWindow { get; set; }
/// <summary>
- /// The list of types that will NOT be allowed to have internet providers run against them even if they are turned on.
- /// </summary>
- /// <value>The internet provider exclude types.</value>
- public string[] InternetProviderExcludeTypes { get; set; }
-
- /// <summary>
/// Gets or sets the recent item days.
/// </summary>
/// <value>The recent item days.</value>
@@ -181,12 +168,6 @@ namespace MediaBrowser.Model.Configuration
public int FileWatcherDelay { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [enable developer tools].
- /// </summary>
- /// <value><c>true</c> if [enable developer tools]; otherwise, <c>false</c>.</value>
- public bool EnableDeveloperTools { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether [enable dashboard response caching].
/// Allows potential contributors without visual studio to modify production dashboard code and test changes.
/// </summary>
@@ -217,22 +198,26 @@ namespace MediaBrowser.Model.Configuration
public ImageSavingConvention ImageSavingConvention { get; set; }
/// <summary>
- /// Gets or sets the width of the min movie backdrop.
+ /// Gets or sets a value indicating whether [enable people prefix sub folders].
/// </summary>
- /// <value>The width of the min movie backdrop.</value>
- public int MinMovieBackdropDownloadWidth { get; set; }
+ /// <value><c>true</c> if [enable people prefix sub folders]; otherwise, <c>false</c>.</value>
+ public bool EnablePeoplePrefixSubFolders { get; set; }
/// <summary>
- /// Gets or sets the width of the min series backdrop.
+ /// Gets or sets the encoding quality.
/// </summary>
- /// <value>The width of the min series backdrop.</value>
- public int MinSeriesBackdropDownloadWidth { get; set; }
+ /// <value>The encoding quality.</value>
+ public EncodingQuality EncodingQuality { get; set; }
- /// <summary>
- /// Gets or sets a value indicating whether [enable people prefix sub folders].
- /// </summary>
- /// <value><c>true</c> if [enable people prefix sub folders]; otherwise, <c>false</c>.</value>
- public bool EnablePeoplePrefixSubFolders { get; set; }
+ public bool EnableMovieChapterImageExtraction { get; set; }
+ public bool EnableEpisodeChapterImageExtraction { get; set; }
+ public bool EnableOtherVideoChapterImageExtraction { get; set; }
+
+ public MetadataOptions MovieOptions { get; set; }
+ public MetadataOptions TvOptions { get; set; }
+ public MetadataOptions MusicOptions { get; set; }
+ public MetadataOptions GameOptions { get; set; }
+ public MetadataOptions BookOptions { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
@@ -247,9 +232,9 @@ namespace MediaBrowser.Model.Configuration
EnableDashboardResponseCaching = true;
EnableVideoImageExtraction = true;
-#if (DEBUG)
- EnableDeveloperTools = true;
-#endif
+ EnableMovieChapterImageExtraction = true;
+ EnableEpisodeChapterImageExtraction = false;
+ EnableOtherVideoChapterImageExtraction = false;
MinResumePct = 5;
MaxResumePct = 90;
@@ -260,7 +245,6 @@ namespace MediaBrowser.Model.Configuration
RecentItemDays = 10;
EnableInternetProviders = true; //initial installs will need these
- InternetProviderExcludeTypes = new string[] { };
ManualLoginClients = new ManualLoginCategory[] { };
@@ -275,7 +259,6 @@ namespace MediaBrowser.Model.Configuration
};
DownloadMusicArtistImages = new ImageDownloadOptions();
DownloadMusicAlbumImages = new ImageDownloadOptions();
- MaxBackdrops = 3;
SortReplaceCharacters = new[] { ".", "+", "%" };
SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
@@ -283,8 +266,20 @@ namespace MediaBrowser.Model.Configuration
SeasonZeroDisplayName = "Specials";
- MinMovieBackdropDownloadWidth = 1280;
- MinSeriesBackdropDownloadWidth = 1280;
+ MovieOptions = new MetadataOptions();
+ TvOptions = new MetadataOptions();
+
+ MusicOptions = new MetadataOptions()
+ {
+ MaxBackdrops = 1
+ };
+
+ GameOptions = new MetadataOptions();
+
+ BookOptions = new MetadataOptions
+ {
+ MaxBackdrops = 1
+ };
}
}
@@ -293,4 +288,12 @@ namespace MediaBrowser.Model.Configuration
Legacy,
Compatible
}
+
+ public enum EncodingQuality
+ {
+ Auto,
+ HighSpeed,
+ HighQuality,
+ MaxQuality
+ }
}
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index b736474e0..90accff94 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -60,6 +60,13 @@ namespace MediaBrowser.Model.Configuration
public bool DisplayUnairedEpisodes { get; set; }
public bool EnableRemoteControlOfOtherUsers { get; set; }
+ public bool BlockUnratedMovies { get; set; }
+ public bool BlockUnratedTrailers { get; set; }
+ public bool BlockUnratedSeries { get; set; }
+ public bool BlockUnratedMusic { get; set; }
+ public bool BlockUnratedGames { get; set; }
+ public bool BlockUnratedBooks { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
/// </summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 0690de5ce..9adfcfa99 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -36,6 +36,9 @@ namespace MediaBrowser.Model.Dto
public int? AbsoluteEpisodeNumber { get; set; }
public bool? DisplaySpecialsWithSeasons { get; set; }
+ public string PreferredMetadataLanguage { get; set; }
+ public string PreferredMetadataCountryCode { get; set; }
+
/// <summary>
/// Gets or sets the DVD season number.
/// </summary>
@@ -88,7 +91,7 @@ namespace MediaBrowser.Model.Dto
/// </summary>
/// <value>The path.</value>
public string Path { get; set; }
-
+
/// <summary>
/// Gets or sets the official rating.
/// </summary>
@@ -210,12 +213,6 @@ namespace MediaBrowser.Model.Dto
public Dictionary<string, string> ProviderIds { get; set; }
/// <summary>
- /// Gets or sets the language.
- /// </summary>
- /// <value>The language.</value>
- public string Language { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether this instance is HD.
/// </summary>
/// <value><c>null</c> if [is HD] contains no value, <c>true</c> if [is HD]; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs
index 85f2da31e..a99fd0fe0 100644
--- a/MediaBrowser.Model/Entities/MetadataFields.cs
+++ b/MediaBrowser.Model/Entities/MetadataFields.cs
@@ -41,6 +41,18 @@ namespace MediaBrowser.Model.Entities
/// <summary>
/// The official rating
/// </summary>
- OfficialRating
+ OfficialRating,
+ /// <summary>
+ /// The images
+ /// </summary>
+ Images,
+ /// <summary>
+ /// The backdrops
+ /// </summary>
+ Backdrops,
+ /// <summary>
+ /// The screenshots
+ /// </summary>
+ Screenshots
}
}
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index 020771e5e..89c92e6fd 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -23,6 +23,12 @@ namespace MediaBrowser.Model.LiveTv
public string Id { get; set; }
/// <summary>
+ /// Gets or sets the external identifier.
+ /// </summary>
+ /// <value>The external identifier.</value>
+ public string ExternalId { get; set; }
+
+ /// <summary>
/// Gets or sets the image tags.
/// </summary>
/// <value>The image tags.</value>
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index b3542fcf8..8b8b0cd07 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -1,6 +1,7 @@
-using System;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using System;
using System.Collections.Generic;
-using MediaBrowser.Model.Dto;
namespace MediaBrowser.Model.LiveTv
{
@@ -12,6 +13,18 @@ namespace MediaBrowser.Model.LiveTv
public string Id { get; set; }
/// <summary>
+ /// Gets or sets the timer identifier.
+ /// </summary>
+ /// <value>The timer identifier.</value>
+ public string TimerId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the series timer identifier.
+ /// </summary>
+ /// <value>The series timer identifier.</value>
+ public string SeriesTimerId { get; set; }
+
+ /// <summary>
/// Gets or sets the external identifier.
/// </summary>
/// <value>The external identifier.</value>
@@ -24,6 +37,12 @@ namespace MediaBrowser.Model.LiveTv
public string ChannelId { get; set; }
/// <summary>
+ /// Gets or sets the name of the channel.
+ /// </summary>
+ /// <value>The name of the channel.</value>
+ public string ChannelName { get; set; }
+
+ /// <summary>
/// Gets or sets the community rating.
/// </summary>
/// <value>The community rating.</value>
@@ -103,20 +122,80 @@ namespace MediaBrowser.Model.LiveTv
public string EpisodeTitle { get; set; }
/// <summary>
+ /// Gets or sets the image tags.
+ /// </summary>
+ /// <value>The image tags.</value>
+ public Dictionary<ImageType, Guid> ImageTags { get; set; }
+
+ /// <summary>
/// Gets or sets the user data.
/// </summary>
/// <value>The user data.</value>
public UserItemDataDto UserData { get; set; }
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is movie.
+ /// </summary>
+ /// <value><c>true</c> if this instance is movie; otherwise, <c>false</c>.</value>
+ public bool IsMovie { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is sports.
+ /// </summary>
+ /// <value><c>true</c> if this instance is sports; otherwise, <c>false</c>.</value>
+ public bool IsSports { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is series.
+ /// </summary>
+ /// <value><c>true</c> if this instance is series; otherwise, <c>false</c>.</value>
+ public bool IsSeries { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is live.
+ /// </summary>
+ /// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
+ public bool IsLive { get; set; }
+
+ /// <summary>
+ /// Gets or sets the type.
+ /// </summary>
+ /// <value>The type.</value>
+ public string Type { get; set; }
+
+ /// <summary>
+ /// Gets or sets the run time ticks.
+ /// </summary>
+ /// <value>The run time ticks.</value>
+ public long? RunTimeTicks { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is news.
+ /// </summary>
+ /// <value><c>true</c> if this instance is news; otherwise, <c>false</c>.</value>
+ public bool IsNews { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is kids.
+ /// </summary>
+ /// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
+ public bool IsKids { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is premiere.
+ /// </summary>
+ /// <value><c>true</c> if this instance is premiere; otherwise, <c>false</c>.</value>
+ public bool IsPremiere { get; set; }
+
public ProgramInfoDto()
{
Genres = new List<string>();
+ ImageTags = new Dictionary<ImageType, Guid>();
}
}
public enum ProgramAudio
{
- Unspecified,
Mono,
Stereo,
Dolby,
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index d17ebee6d..3cf44f5c4 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.LiveTv
{
@@ -12,6 +13,12 @@ namespace MediaBrowser.Model.LiveTv
public string Id { get; set; }
/// <summary>
+ /// Gets or sets the series timer identifier.
+ /// </summary>
+ /// <value>The series timer identifier.</value>
+ public string SeriesTimerId { get; set; }
+
+ /// <summary>
/// Gets or sets the external identifier.
/// </summary>
/// <value>The external identifier.</value>
@@ -34,6 +41,12 @@ namespace MediaBrowser.Model.LiveTv
public string ChannelName { get; set; }
/// <summary>
+ /// Gets or sets the name of the service.
+ /// </summary>
+ /// <value>The name of the service.</value>
+ public string ServiceName { get; set; }
+
+ /// <summary>
/// Name of the recording.
/// </summary>
public string Name { get; set; }
@@ -45,6 +58,12 @@ namespace MediaBrowser.Model.LiveTv
public string Path { get; set; }
/// <summary>
+ /// Gets or sets the URL.
+ /// </summary>
+ /// <value>The URL.</value>
+ public string Url { get; set; }
+
+ /// <summary>
/// Overview of the recording.
/// </summary>
public string Overview { get; set; }
@@ -83,10 +102,10 @@ namespace MediaBrowser.Model.LiveTv
public string EpisodeTitle { get; set; }
/// <summary>
- /// Gets or sets the duration ms.
+ /// Gets or sets the run time ticks.
/// </summary>
- /// <value>The duration ms.</value>
- public int DurationMs { get; set; }
+ /// <value>The run time ticks.</value>
+ public long? RunTimeTicks { get; set; }
/// <summary>
/// Gets or sets the type of the media.
@@ -125,14 +144,69 @@ namespace MediaBrowser.Model.LiveTv
public ProgramAudio? Audio { get; set; }
/// <summary>
+ /// Gets or sets a value indicating whether this instance is movie.
+ /// </summary>
+ /// <value><c>true</c> if this instance is movie; otherwise, <c>false</c>.</value>
+ public bool IsMovie { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is sports.
+ /// </summary>
+ /// <value><c>true</c> if this instance is sports; otherwise, <c>false</c>.</value>
+ public bool IsSports { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is series.
+ /// </summary>
+ /// <value><c>true</c> if this instance is series; otherwise, <c>false</c>.</value>
+ public bool IsSeries { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is live.
+ /// </summary>
+ /// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
+ public bool IsLive { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is news.
+ /// </summary>
+ /// <value><c>true</c> if this instance is news; otherwise, <c>false</c>.</value>
+ public bool IsNews { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is kids.
+ /// </summary>
+ /// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
+ public bool IsKids { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is premiere.
+ /// </summary>
+ /// <value><c>true</c> if this instance is premiere; otherwise, <c>false</c>.</value>
+ public bool IsPremiere { get; set; }
+
+ /// <summary>
+ /// Gets or sets the image tags.
+ /// </summary>
+ /// <value>The image tags.</value>
+ public Dictionary<ImageType, Guid> ImageTags { get; set; }
+
+ /// <summary>
/// Gets or sets the user data.
/// </summary>
/// <value>The user data.</value>
public UserItemDataDto UserData { get; set; }
+ /// <summary>
+ /// Gets or sets the type.
+ /// </summary>
+ /// <value>The type.</value>
+ public string Type { get; set; }
+
public RecordingInfoDto()
{
Genres = new List<string>();
+ ImageTags = new Dictionary<ImageType, Guid>();
}
}
} \ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 3aa94ff83..20a7074a5 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -16,6 +16,12 @@
/// </summary>
/// <value>The user identifier.</value>
public string UserId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the identifier.
+ /// </summary>
+ /// <value>The identifier.</value>
+ public string Id { get; set; }
}
public class TimerQuery
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 06bc98e63..95e9dcb01 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -14,15 +14,6 @@ namespace MediaBrowser.Model.LiveTv
Error
}
- public enum RecurrenceType
- {
- Manual,
- NewProgramEventsOneChannel,
- AllProgramEventsOneChannel,
- NewProgramEventsAllChannels,
- AllProgramEventsAllChannels
- }
-
public enum DayPattern
{
Daily,
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 3862c0745..a8c6a2e37 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -22,6 +22,12 @@ namespace MediaBrowser.Model.LiveTv
public string ChannelId { get; set; }
/// <summary>
+ /// Gets or sets the name of the service.
+ /// </summary>
+ /// <value>The name of the service.</value>
+ public string ServiceName { get; set; }
+
+ /// <summary>
/// Gets or sets the external channel identifier.
/// </summary>
/// <value>The external channel identifier.</value>
@@ -65,10 +71,22 @@ namespace MediaBrowser.Model.LiveTv
public DateTime EndDate { get; set; }
/// <summary>
- /// Gets or sets the type of the recurrence.
+ /// 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; }
+
+ /// <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; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether [record new only].
/// </summary>
- /// <value>The type of the recurrence.</value>
- public RecurrenceType RecurrenceType { get; set; }
+ /// <value><c>true</c> if [record new only]; otherwise, <c>false</c>.</value>
+ public bool RecordNewOnly { get; set; }
/// <summary>
/// Gets or sets the days.
@@ -89,28 +107,28 @@ namespace MediaBrowser.Model.LiveTv
public int Priority { get; set; }
/// <summary>
- /// Gets or sets the requested pre padding seconds.
+ /// Gets or sets the pre padding seconds.
/// </summary>
- /// <value>The requested pre padding seconds.</value>
- public int RequestedPrePaddingSeconds { get; set; }
+ /// <value>The pre padding seconds.</value>
+ public int PrePaddingSeconds { get; set; }
/// <summary>
- /// Gets or sets the requested post padding seconds.
+ /// Gets or sets the post padding seconds.
/// </summary>
- /// <value>The requested post padding seconds.</value>
- public int RequestedPostPaddingSeconds { get; set; }
+ /// <value>The post padding seconds.</value>
+ public int PostPaddingSeconds { get; set; }
/// <summary>
- /// Gets or sets the required pre padding seconds.
+ /// Gets or sets a value indicating whether this instance is pre padding required.
/// </summary>
- /// <value>The required pre padding seconds.</value>
- public int RequiredPrePaddingSeconds { get; set; }
+ /// <value><c>true</c> if this instance is pre padding required; otherwise, <c>false</c>.</value>
+ public bool IsPrePaddingRequired { get; set; }
/// <summary>
- /// Gets or sets the required post padding seconds.
+ /// Gets or sets a value indicating whether this instance is post padding required.
/// </summary>
- /// <value>The required post padding seconds.</value>
- public int RequiredPostPaddingSeconds { get; set; }
+ /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
+ public bool IsPostPaddingRequired { get; set; }
public SeriesTimerInfoDto()
{
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index 6b7ab42d3..507ba0947 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -32,12 +32,24 @@ namespace MediaBrowser.Model.LiveTv
public string ChannelName { get; set; }
/// <summary>
+ /// Gets or sets the name of the service.
+ /// </summary>
+ /// <value>The name of the service.</value>
+ public string ServiceName { 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; }
@@ -74,35 +86,47 @@ namespace MediaBrowser.Model.LiveTv
/// </summary>
/// <value>The external series timer identifier.</value>
public string ExternalSeriesTimerId { get; set; }
-
+
+ /// <summary>
+ /// Gets or sets the pre padding seconds.
+ /// </summary>
+ /// <value>The pre padding seconds.</value>
+ public int PrePaddingSeconds { get; set; }
+
+ /// <summary>
+ /// Gets or sets the post padding seconds.
+ /// </summary>
+ /// <value>The post padding seconds.</value>
+ public int PostPaddingSeconds { get; set; }
+
/// <summary>
- /// Gets or sets the requested pre padding seconds.
+ /// Gets or sets a value indicating whether this instance is pre padding required.
/// </summary>
- /// <value>The requested pre padding seconds.</value>
- public int RequestedPrePaddingSeconds { get; set; }
+ /// <value><c>true</c> if this instance is pre padding required; otherwise, <c>false</c>.</value>
+ public bool IsPrePaddingRequired { get; set; }
/// <summary>
- /// Gets or sets the requested post padding seconds.
+ /// Gets or sets a value indicating whether this instance is post padding required.
/// </summary>
- /// <value>The requested post padding seconds.</value>
- public int RequestedPostPaddingSeconds { get; set; }
+ /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
+ public bool IsPostPaddingRequired { get; set; }
/// <summary>
- /// Gets or sets the required pre padding seconds.
+ /// Gets or sets the run time ticks.
/// </summary>
- /// <value>The required pre padding seconds.</value>
- public int RequiredPrePaddingSeconds { get; set; }
+ /// <value>The run time ticks.</value>
+ public long? RunTimeTicks { get; set; }
/// <summary>
- /// Gets or sets the required post padding seconds.
+ /// Gets or sets the priority.
/// </summary>
- /// <value>The required post padding seconds.</value>
- public int RequiredPostPaddingSeconds { get; set; }
+ /// <value>The priority.</value>
+ public int Priority { get; set; }
/// <summary>
- /// Gets or sets the duration ms.
+ /// Gets or sets the program information.
/// </summary>
- /// <value>The duration ms.</value>
- public int DurationMs { get; set; }
+ /// <value>The program information.</value>
+ public ProgramInfoDto ProgramInfo { get; set; }
}
}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 071f5bdde..bb6fedb9f 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -12,7 +12,7 @@
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
- <FodyPath>..\packages\Fody.1.17.0.0</FodyPath>
+ <FodyPath>..\packages\Fody.1.19.1.0</FodyPath>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -118,7 +118,7 @@
<Compile Include="Session\MessageCommand.cs" />
<Compile Include="Session\PlayRequest.cs" />
<Compile Include="Session\PlaystateCommand.cs" />
- <Compile Include="Entities\ImageDownloadOptions.cs" />
+ <Compile Include="Configuration\ImageDownloadOptions.cs" />
<Compile Include="Logging\ILogManager.cs" />
<Compile Include="MediaInfo\BlurayDiscInfo.cs" />
<Compile Include="Entities\ChapterInfo.cs" />
@@ -209,8 +209,9 @@
<PostBuildEvent Condition=" '$(ConfigurationName)' != 'Release Mono' ">if '$(ConfigurationName)' == 'Release' (
xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\net45\" /y /d /r /i
)</PostBuildEvent>
+ <PostBuildEvent Condition=" '$(ConfigurationName)' == 'Release Mono' ">cp -fu "$(MSBuildProjectDirectory)\..\packages\PropertyChanged.Fody.1.41.0.0\PropertyChanged.Fody.dll" "$(MSBuildProjectDirectory)\..\Tools\Fody\"</PostBuildEvent>
</PropertyGroup>
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
<Import Project="Fody.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs
index 1e16b0492..bebe23734 100644
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Model.Search
public int? IndexNumber { get; set; }
/// <summary>
+ /// Gets or sets the production year.
+ /// </summary>
+ /// <value>The production year.</value>
+ public int? ProductionYear { get; set; }
+
+ /// <summary>
/// Gets or sets the parent index number.
/// </summary>
/// <value>The parent index number.</value>
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 02b7f0226..80f6ea2c0 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -14,6 +14,12 @@ namespace MediaBrowser.Model.Session
public bool CanSeek { get; set; }
/// <summary>
+ /// Gets or sets the remote end point.
+ /// </summary>
+ /// <value>The remote end point.</value>
+ public string RemoteEndPoint { get; set; }
+
+ /// <summary>
/// Gets or sets the queueable media types.
/// </summary>
/// <value>The queueable media types.</value>
diff --git a/MediaBrowser.Model/packages.config b/MediaBrowser.Model/packages.config
index 622e6f72f..3d7793afb 100644
--- a/MediaBrowser.Model/packages.config
+++ b/MediaBrowser.Model/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Fody" version="1.17.0.0" targetFramework="net45" />
+ <package id="Fody" version="1.19.1.0" targetFramework="net45" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="net45" />
</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 19:46:12 +0000