diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-06 19:01:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 19:01:30 -0400 |
| commit | e9bf2e413222af14ca791d989bd0470d5e282ae0 (patch) | |
| tree | 326030dc1915f3c4e00f4f10eab5c171b7e87ca4 /MediaBrowser.Providers | |
| parent | d8c2dd253277ba2ce7a5a7496b278db0e4e85106 (diff) | |
| parent | 6d78824c8e9fa9fe1e46944ca6901af724b8f7cd (diff) | |
Merge pull request #2796 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/Manager/MetadataService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs | 2 |
3 files changed, 10 insertions, 12 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; + } } } } diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs index cdf5772c23..0d0b680bdb 100644 --- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs @@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.MediaInfo } // No support for this - if (video.VideoType == VideoType.Iso) + if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.Dvd || video.VideoType == VideoType.BluRay) { return Task.FromResult(new DynamicImageResponse { HasImage = false }); } |