diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 58 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/StudioDto.cs | 29 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
5 files changed, 7 insertions, 94 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index a570f7b10..db66837e4 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -162,7 +162,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableAutomaticRestart { get; set; } public bool SkipDeserializationForBasicTypes { get; set; } - public bool SkipDeserializationForAudio { get; set; } public string ServerName { get; set; } public string WanDdns { get; set; } @@ -349,7 +348,9 @@ namespace MediaBrowser.Model.Configuration Limit = 1, Type = ImageType.Logo } - } + }, + + DisabledImageFetchers = new [] {"FanArt"} }, new MetadataOptions(1, 1280) @@ -539,7 +540,8 @@ namespace MediaBrowser.Model.Configuration Type = ImageType.Thumb } }, - DisabledMetadataFetchers = new []{ "TheMovieDb" } + DisabledMetadataFetchers = new []{ "TheMovieDb" }, + DisabledImageFetchers = new [] { "FanArt" } }, new MetadataOptions(0, 1280) diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index e5cc22c5f..2df69a58f 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -210,12 +210,6 @@ namespace MediaBrowser.Model.Dto public List<string> Genres { get; set; } /// <summary> - /// Gets or sets the series genres. - /// </summary> - /// <value>The series genres.</value> - public List<string> SeriesGenres { get; set; } - - /// <summary> /// Gets or sets the community rating. /// </summary> /// <value>The community rating.</value> @@ -258,12 +252,6 @@ namespace MediaBrowser.Model.Dto public int? ProductionYear { get; set; } /// <summary> - /// Gets or sets the players supported by a game. - /// </summary> - /// <value>The players.</value> - public int? Players { get; set; } - - /// <summary> /// Gets or sets a value indicating whether this instance is place holder. /// </summary> /// <value><c>null</c> if [is place holder] contains no value, <c>true</c> if [is place holder]; otherwise, <c>false</c>.</value> @@ -432,7 +420,7 @@ namespace MediaBrowser.Model.Dto /// Gets or sets the air days. /// </summary> /// <value>The air days.</value> - public List<DayOfWeek> AirDays { get; set; } + public DayOfWeek[] AirDays { get; set; } /// <summary> /// Gets or sets the tags. @@ -456,7 +444,7 @@ namespace MediaBrowser.Model.Dto /// Gets or sets the artist items. /// </summary> /// <value>The artist items.</value> - public List<NameIdPair> ArtistItems { get; set; } + public NameIdPair[] ArtistItems { get; set; } /// <summary> /// Gets or sets the album. @@ -598,8 +586,6 @@ namespace MediaBrowser.Model.Dto /// <value>The series studio.</value> public string SeriesStudio { get; set; } - public StudioDto SeriesStudioInfo { get; set; } - /// <summary> /// Gets or sets the parent thumb item id. /// </summary> @@ -742,46 +728,6 @@ namespace MediaBrowser.Model.Dto public string SeriesTimerId { get; set; } /// <summary> - /// Gets a value indicating whether this instance has art. - /// </summary> - /// <value><c>true</c> if this instance has art; otherwise, <c>false</c>.</value> - [IgnoreDataMember] - public bool HasArtImage - { - get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Art); } - } - - /// <summary> - /// Gets a value indicating whether this instance has logo. - /// </summary> - /// <value><c>true</c> if this instance has logo; otherwise, <c>false</c>.</value> - [IgnoreDataMember] - public bool HasLogo - { - get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Logo); } - } - - /// <summary> - /// Gets a value indicating whether this instance has thumb. - /// </summary> - /// <value><c>true</c> if this instance has thumb; otherwise, <c>false</c>.</value> - [IgnoreDataMember] - public bool HasThumb - { - get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Thumb); } - } - - /// <summary> - /// Gets a value indicating whether this instance has thumb. - /// </summary> - /// <value><c>true</c> if this instance has thumb; otherwise, <c>false</c>.</value> - [IgnoreDataMember] - public bool HasBackdrop - { - get { return (BackdropImageTags != null && BackdropImageTags.Length > 0) || (ParentBackdropImageTags != null && ParentBackdropImageTags.Length > 0); } - } - - /// <summary> /// Gets or sets the program identifier. /// </summary> /// <value>The program identifier.</value> diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs deleted file mode 100644 index 10dc60699..000000000 --- a/MediaBrowser.Model/Dto/StudioDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Diagnostics; - -namespace MediaBrowser.Model.Dto -{ - /// <summary> - /// Class StudioDto - /// </summary> - [DebuggerDisplay("Name = {Name}")] - public class StudioDto - { - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the identifier. - /// </summary> - /// <value>The identifier.</value> - public string Id { get; set; } - - /// <summary> - /// Gets or sets the primary image tag. - /// </summary> - /// <value>The primary image tag.</value> - public string PrimaryImageTag { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 249e970dd..547baee66 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -284,7 +284,6 @@ <Compile Include="Providers\ExternalUrl.cs" /> <Compile Include="Providers\ImageProviderInfo.cs" /> <Compile Include="Providers\RemoteImageInfo.cs" /> - <Compile Include="Dto\StudioDto.cs" /> <Compile Include="Entities\CollectionType.cs" /> <Compile Include="Entities\ItemReview.cs" /> <Compile Include="Entities\MediaUrl.cs" /> diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index a294e4a3a..6cc6ba329 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -153,11 +153,6 @@ /// </summary> ScreenshotImageTags, - /// <summary> - /// The series genres - /// </summary> - SeriesGenres, - SeriesPrimaryImage, /// <summary> |
