diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 47 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/DtoBuilder.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/BaseItemDto.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
5 files changed, 1 insertions, 81 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 7587a8a5a..67ec219bb 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -547,12 +547,6 @@ namespace MediaBrowser.Controller.Entities public virtual List<string> Studios { get; set; } /// <summary> - /// Gets or sets the publishers. - /// </summary> - /// <value>The publishers.</value> - public virtual List<string> Publishers { get; set; } - - /// <summary> /// Gets or sets the genres. /// </summary> /// <value>The genres.</value> @@ -1017,47 +1011,6 @@ namespace MediaBrowser.Controller.Entities } /// <summary> - /// Adds the publishers. - /// </summary> - /// <param name="publishers">The publishers.</param> - /// <exception cref="System.ArgumentNullException"></exception> - public void AddPublishers(IEnumerable<string> publishers) - { - if (publishers == null) - { - throw new ArgumentNullException(); - } - - foreach (var name in publishers) - { - AddPublisher(name); - } - } - - /// <summary> - /// Adds the publisher. - /// </summary> - /// <param name="name">The name.</param> - /// <exception cref="System.ArgumentNullException">name</exception> - public void AddPublisher(string name) - { - if (string.IsNullOrWhiteSpace(name)) - { - throw new ArgumentNullException("name"); - } - - if (Publishers == null) - { - Publishers = new List<string>(); - } - - if (!Publishers.Contains(name, StringComparer.OrdinalIgnoreCase)) - { - Publishers.Add(name); - } - } - - /// <summary> /// Adds a tagline to the item /// </summary> /// <param name="name">The name.</param> diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 1fde6a2d8..4dfe78faf 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 e5f57d704..a7cc4985b 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"); } /// <summary> @@ -169,22 +169,6 @@ namespace MediaBrowser.Controller.Providers.MediaInfo } /// <summary> - /// Fetches the publishers. - /// </summary> - /// <param name="audio">The audio.</param> - /// <param name="tags">The tags.</param> - /// <param name="tagName">Name of the tag.</param> - private void FetchPublishers(Audio audio, Dictionary<string, string> tags, string tagName) - { - var val = GetDictionaryValue(tags, tagName); - - if (!string.IsNullOrEmpty(val)) - { - audio.AddPublishers(val.Split(new[] { '/', '|' }, StringSplitOptions.RemoveEmptyEntries)); - } - } - - /// <summary> /// Gets the genres from the tags collection /// </summary> /// <param name="audio">The audio.</param> diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs index dd218b832..b4d6aecd9 100644 --- a/MediaBrowser.Model/DTO/BaseItemDto.cs +++ b/MediaBrowser.Model/DTO/BaseItemDto.cs @@ -432,13 +432,6 @@ namespace MediaBrowser.Model.Dto /// <value>The overview HTML.</value> [ProtoMember(70)] public string OverviewHtml { get; set; } - - /// <summary> - /// Gets or sets the publishers. - /// </summary> - /// <value>The publishers.</value> - [ProtoMember(71)] - public List<string> Publishers { get; set; } /// <summary> /// Gets a value indicating whether this instance can resume. diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index d693b5c53..30f62bf8f 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 /// </summary> PrimaryImageAspectRatio, - - /// <summary> - /// The publishers - /// </summary> - Publishers, /// <summary> /// AirDays, status, SeriesName, etc |