diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-09 03:18:43 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-09 03:18:43 -0400 |
| commit | daaae69df575f1d7692ba29d6f5ddd4c59516f82 (patch) | |
| tree | 24c818ece042d36808fd0a68834b2853bf4512e1 /MediaBrowser.Providers | |
| parent | b3595eab6a94fda4f81f637007b2ac79e8a85065 (diff) | |
add playback of in-progress recordings
Diffstat (limited to 'MediaBrowser.Providers')
4 files changed, 17 insertions, 17 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index d98b2e2b12..fabe08f334 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -170,6 +170,14 @@ namespace MediaBrowser.Providers.Manager } } + if (!lockedFields.Contains(MetadataFields.ProductionLocations)) + { + if (replaceData || target.ProductionLocations.Count == 0) + { + target.ProductionLocations = source.ProductionLocations; + } + } + if (replaceData || !target.VoteCount.HasValue) { target.VoteCount = source.VoteCount; diff --git a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs index 5360a58c80..82a2dfbe94 100644 --- a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs +++ b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs @@ -148,14 +148,10 @@ namespace MediaBrowser.Providers.Movies if (movieData.production_countries != null) { - //var hasProductionLocations = movie as IHasProductionLocations; - //if (hasProductionLocations != null) - //{ - // hasProductionLocations.ProductionLocations = movieData - // .production_countries - // .Select(i => i.name) - // .ToList(); - //} + movie.ProductionLocations = movieData + .production_countries + .Select(i => i.name) + .ToList(); } movie.SetProviderId(MetadataProviders.Tmdb, movieData.id.ToString(_usCulture)); diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs index bb17b83ec8..c954e6323a 100644 --- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs +++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs @@ -179,7 +179,11 @@ namespace MediaBrowser.Providers.People item.Name = info.name; item.HomePageUrl = info.homepage; - item.PlaceOfBirth = info.place_of_birth; + + if (!string.IsNullOrWhiteSpace(info.place_of_birth)) + { + item.ProductionLocations = new List<string> { info.place_of_birth }; + } item.Overview = info.biography; DateTime date; diff --git a/MediaBrowser.Providers/People/PersonMetadataService.cs b/MediaBrowser.Providers/People/PersonMetadataService.cs index 0be5773dbc..0f8bd8b662 100644 --- a/MediaBrowser.Providers/People/PersonMetadataService.cs +++ b/MediaBrowser.Providers/People/PersonMetadataService.cs @@ -15,14 +15,6 @@ namespace MediaBrowser.Providers.People protected override void MergeData(MetadataResult<Person> source, MetadataResult<Person> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); - - var sourceItem = source.Item; - var targetItem = target.Item; - - if (replaceData || string.IsNullOrEmpty(targetItem.PlaceOfBirth)) - { - targetItem.PlaceOfBirth = sourceItem.PlaceOfBirth; - } } public PersonMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager) |