From 70377c71ccf28efd81dbeecdd8fa6a62d6259bb6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Apr 2013 11:13:23 -0400 Subject: [PATCH] removed Publishers --- MediaBrowser.Controller/Entities/BaseItem.cs | 47 ------------------- MediaBrowser.Controller/Library/DtoBuilder.cs | 5 -- .../MediaInfo/FFProbeAudioInfoProvider.cs | 18 +------ MediaBrowser.Model/DTO/BaseItemDto.cs | 7 --- MediaBrowser.Model/Querying/ItemFields.cs | 5 -- 5 files changed, 1 insertion(+), 81 deletions(-) diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 7587a8a5a0..67ec219bb4 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -546,12 +546,6 @@ namespace MediaBrowser.Controller.Entities /// The studios. public virtual List Studios { get; set; } - /// - /// Gets or sets the publishers. - /// - /// The publishers. - public virtual List Publishers { get; set; } - /// /// Gets or sets the genres. /// @@ -1016,47 +1010,6 @@ namespace MediaBrowser.Controller.Entities } } - /// - /// Adds the publishers. - /// - /// The publishers. - /// - public void AddPublishers(IEnumerable publishers) - { - if (publishers == null) - { - throw new ArgumentNullException(); - } - - foreach (var name in publishers) - { - AddPublisher(name); - } - } - - /// - /// Adds the publisher. - /// - /// The name. - /// name - public void AddPublisher(string name) - { - if (string.IsNullOrWhiteSpace(name)) - { - throw new ArgumentNullException("name"); - } - - if (Publishers == null) - { - Publishers = new List(); - } - - if (!Publishers.Contains(name, StringComparer.OrdinalIgnoreCase)) - { - Publishers.Add(name); - } - } - /// /// Adds a tagline to the item /// diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 1fde6a2d8e..4dfe78faf7 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -63,11 +63,6 @@ namespace MediaBrowser.Controller.Library { dto.Studios = item.Studios; } - - if (fields.Contains(ItemFields.Publishers)) - { - dto.Publishers = item.Publishers; - } if (fields.Contains(ItemFields.People)) { diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index e5f57d704c..a7cc4985b0 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -149,7 +149,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo // There's several values in tags may or may not be present FetchStudios(audio, tags, "organization"); FetchStudios(audio, tags, "ensemble"); - FetchPublishers(audio, tags, "publisher"); + FetchStudios(audio, tags, "publisher"); } /// @@ -168,22 +168,6 @@ namespace MediaBrowser.Controller.Providers.MediaInfo } } - /// - /// Fetches the publishers. - /// - /// The audio. - /// The tags. - /// Name of the tag. - private void FetchPublishers(Audio audio, Dictionary tags, string tagName) - { - var val = GetDictionaryValue(tags, tagName); - - if (!string.IsNullOrEmpty(val)) - { - audio.AddPublishers(val.Split(new[] { '/', '|' }, StringSplitOptions.RemoveEmptyEntries)); - } - } - /// /// Gets the genres from the tags collection /// diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs index dd218b832e..b4d6aecd9b 100644 --- a/MediaBrowser.Model/DTO/BaseItemDto.cs +++ b/MediaBrowser.Model/DTO/BaseItemDto.cs @@ -432,13 +432,6 @@ namespace MediaBrowser.Model.Dto /// The overview HTML. [ProtoMember(70)] public string OverviewHtml { get; set; } - - /// - /// Gets or sets the publishers. - /// - /// The publishers. - [ProtoMember(71)] - public List Publishers { get; set; } /// /// Gets a value indicating whether this instance can resume. diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index d693b5c532..30f62bf8f2 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -80,11 +80,6 @@ namespace MediaBrowser.Model.Querying /// The aspect ratio of the primary image /// PrimaryImageAspectRatio, - - /// - /// The publishers - /// - Publishers, /// /// AirDays, status, SeriesName, etc