diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-15 00:34:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 00:34:33 -0400 |
| commit | a4efcf07f42d1ccd2be0c2f4d2af1208366f6ab6 (patch) | |
| tree | c4d0a9693850b977b66c057508b286ed50da9a3c /MediaBrowser.Providers | |
| parent | e2085763296e32e7ef1532460030e5449725116a (diff) | |
| parent | 4a8aa20698aa761cba7ab7e45181a2b3251fca64 (diff) | |
Merge pull request #2639 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Omdb/OmdbProvider.cs | 6 |
2 files changed, 0 insertions, 21 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index d5494c21fd..1e107d0be1 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -198,7 +198,6 @@ namespace MediaBrowser.Providers.Manager MergeAlbumArtist(source, target, lockedFields, replaceData); MergeCriticRating(source, target, lockedFields, replaceData); - MergeAwards(source, target, lockedFields, replaceData); MergeTrailers(source, target, lockedFields, replaceData); MergeVideoInfo(source, target, lockedFields, replaceData); @@ -273,20 +272,6 @@ namespace MediaBrowser.Providers.Manager } } - private static void MergeAwards(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData) - { - var sourceCast = source as IHasAwards; - var targetCast = target as IHasAwards; - - if (sourceCast != null && targetCast != null) - { - if (replaceData || string.IsNullOrEmpty(targetCast.AwardSummary)) - { - targetCast.AwardSummary = sourceCast.AwardSummary; - } - } - } - private static void MergeCriticRating(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData) { if (replaceData || !target.CriticRating.HasValue) diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs index b89105376a..dd3ba23db1 100644 --- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs +++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs @@ -406,12 +406,6 @@ namespace MediaBrowser.Providers.Omdb } } - var hasAwards = item as IHasAwards; - if (hasAwards != null && !string.IsNullOrEmpty(result.Awards)) - { - hasAwards.AwardSummary = WebUtility.HtmlDecode(result.Awards); - } - if (isConfiguredForEnglish) { // Omdb is currently english only, so for other languages skip this and let secondary providers fill it in |