diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-08-06 19:01:00 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-08-06 19:01:00 -0400 |
| commit | 6d78824c8e9fa9fe1e46944ca6901af724b8f7cd (patch) | |
| tree | 326030dc1915f3c4e00f4f10eab5c171b7e87ca4 /MediaBrowser.Providers | |
| parent | 27c490c15256951a4e2172566c7313f33e0f0af3 (diff) | |
update components
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/Manager/MetadataService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index edca5e7d68..01aee9b92e 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -302,13 +302,6 @@ namespace MediaBrowser.Providers.Manager updateType |= ItemUpdateType.MetadataImport; } - var inheritedTags = item.GetInheritedTags(); - if (!inheritedTags.SequenceEqual(item.InheritedTags, StringComparer.Ordinal)) - { - item.InheritedTags = inheritedTags; - updateType |= ItemUpdateType.MetadataImport; - } - return updateType; } diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index ff266f4c12..93a386ed59 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -204,12 +204,17 @@ namespace MediaBrowser.Providers.Manager //if (!lockedFields.Contains(MetadataFields.DisplayMediaType)) { - if (replaceData || string.IsNullOrEmpty(target.DisplayMediaType)) + var targetVideo = target as Video; + var sourceVideo = source as Video; + if (sourceVideo != null && targetVideo != null) { - // Safeguard against incoming data having an emtpy name - if (!string.IsNullOrWhiteSpace(source.DisplayMediaType)) + if (replaceData || string.IsNullOrEmpty(targetVideo.DisplayMediaType)) { - target.DisplayMediaType = source.DisplayMediaType; + // Safeguard against incoming data having an emtpy name + if (!string.IsNullOrWhiteSpace(sourceVideo.DisplayMediaType)) + { + targetVideo.DisplayMediaType = sourceVideo.DisplayMediaType; + } } } } |
