diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-13 16:49:16 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-13 16:49:16 -0400 |
| commit | b0379ec7f8fb4804f76d64264a4b35b65debedc6 (patch) | |
| tree | 4eda44b6d9d1124bcf752742976f54fad1814889 /MediaBrowser.Providers/Manager | |
| parent | 41ee4600fd2b5af9732b363790d6b0f44dc272e5 (diff) | |
improve embedded image extraction
Diffstat (limited to 'MediaBrowser.Providers/Manager')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index 20b2ac6cd2..278d8ed710 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -10,9 +10,9 @@ namespace MediaBrowser.Providers.Manager public static class ProviderUtils { public static void MergeBaseItemData<T>(MetadataResult<T> sourceResult, - MetadataResult<T> targetResult, - List<MetadataFields> lockedFields, - bool replaceData, + MetadataResult<T> targetResult, + List<MetadataFields> lockedFields, + bool replaceData, bool mergeMetadataSettings) where T : BaseItem { @@ -89,7 +89,7 @@ namespace MediaBrowser.Providers.Manager { target.CustomRating = source.CustomRating; } - + if (!lockedFields.Contains(MetadataFields.Overview)) { if (replaceData || string.IsNullOrEmpty(target.Overview)) @@ -107,7 +107,7 @@ namespace MediaBrowser.Providers.Manager { if (replaceData || targetResult.People == null || targetResult.People.Count == 0) { - targetResult.People = sourceResult.People ?? new List<PersonInfo>(); + targetResult.People = sourceResult.People; } } @@ -238,7 +238,7 @@ namespace MediaBrowser.Providers.Manager targetHasDisplayOrder.DisplayOrder = sourceHasDisplayOrder.DisplayOrder; } } - + private static void MergeShortOverview(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData) { var sourceHasShortOverview = source as IHasShortOverview; |
