diff options
Diffstat (limited to 'MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs')
| -rw-r--r-- | MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs b/MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs index a074b10c20..2ad5408499 100644 --- a/MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs +++ b/MediaBrowser.Providers/Movies/ManualMovieDbPersonImageProvider.cs @@ -46,43 +46,26 @@ namespace MediaBrowser.Providers.Movies return images.Where(i => i.Type == imageType); } - public Task<IEnumerable<RemoteImageInfo>> GetAllImages(IHasImages item, CancellationToken cancellationToken) - { - return GetAllImagesInternal(item, true, cancellationToken); - } - - public async Task<IEnumerable<RemoteImageInfo>> GetAllImagesInternal(IHasImages item, bool retryOnMissingData, CancellationToken cancellationToken) + public async Task<IEnumerable<RemoteImageInfo>> GetAllImages(IHasImages item, CancellationToken cancellationToken) { var person = (Person)item; var id = person.GetProviderId(MetadataProviders.Tmdb); if (!string.IsNullOrEmpty(id)) { - var dataFilePath = MovieDbPersonProvider.GetPersonDataFilePath(_config.ApplicationPaths, id); - - try - { - var result = _jsonSerializer.DeserializeFromFile<MovieDbPersonProvider.PersonResult>(dataFilePath); - - var images = result.images ?? new MovieDbPersonProvider.Images(); + await MovieDbPersonProvider.Current.DownloadPersonInfoIfNeeded(id, cancellationToken).ConfigureAwait(false); - var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); + var dataFilePath = MovieDbPersonProvider.GetPersonDataFilePath(_config.ApplicationPaths, id); - var tmdbImageUrl = tmdbSettings.images.base_url + "original"; + var result = _jsonSerializer.DeserializeFromFile<MovieDbPersonProvider.PersonResult>(dataFilePath); - return GetImages(images, tmdbImageUrl); - } - catch (FileNotFoundException) - { + var images = result.images ?? new MovieDbPersonProvider.Images(); - } + var tmdbSettings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false); - if (retryOnMissingData) - { - await MovieDbPersonProvider.Current.DownloadPersonInfo(id, cancellationToken).ConfigureAwait(false); + var tmdbImageUrl = tmdbSettings.images.base_url + "original"; - return await GetAllImagesInternal(item, false, cancellationToken).ConfigureAwait(false); - } + return GetImages(images, tmdbImageUrl); } return new List<RemoteImageInfo>(); |
