diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-11 22:33:59 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-11 22:33:59 -0500 |
| commit | 5a41d7e0fd2336d3989b2d93a9ef569e6619436c (patch) | |
| tree | 113fdb5d9f678a5277214864e7ac4c6bfa84b502 /MediaBrowser.Providers/Manager/ProviderManager.cs | |
| parent | 03d17dea70c0b4fb7be589eaacca2b942d90e95f (diff) | |
fixes #709 - Add option to show all languages in image interface
Diffstat (limited to 'MediaBrowser.Providers/Manager/ProviderManager.cs')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderManager.cs | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index 58c05a80b..db0a25ec6 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -205,31 +205,26 @@ namespace MediaBrowser.Providers.Manager /// Gets the available remote images. /// </summary> /// <param name="item">The item.</param> - /// <param name="query">The query.</param> /// <param name="cancellationToken">The cancellation token.</param> + /// <param name="providerName">Name of the provider.</param> + /// <param name="type">The type.</param> /// <returns>Task{IEnumerable{RemoteImageInfo}}.</returns> - public async Task<IEnumerable<RemoteImageInfo>> GetAvailableRemoteImages(IHasImages item, RemoteImageQuery query, CancellationToken cancellationToken) + public async Task<IEnumerable<RemoteImageInfo>> GetAvailableRemoteImages(IHasImages item, CancellationToken cancellationToken, string providerName = null, ImageType? type = null) { - var providers = GetRemoteImageProviders(item, query.IncludeDisabledProviders); + var providers = GetRemoteImageProviders(item, true); - if (!string.IsNullOrEmpty(query.ProviderName)) + if (!string.IsNullOrEmpty(providerName)) { - var providerName = query.ProviderName; - providers = providers.Where(i => string.Equals(i.Name, providerName, StringComparison.OrdinalIgnoreCase)); } var preferredLanguage = item.GetPreferredMetadataLanguage(); - var language = query.IncludeAllLanguages ? null : preferredLanguage; - - var tasks = providers.Select(i => GetImages(item, cancellationToken, i, language, query.ImageType)); + var tasks = providers.Select(i => GetImages(item, cancellationToken, i, preferredLanguage, type)); var results = await Task.WhenAll(tasks).ConfigureAwait(false); - var images = results.SelectMany(i => i); - - return images; + return results.SelectMany(i => i); } /// <summary> @@ -249,15 +244,12 @@ namespace MediaBrowser.Providers.Manager { var result = await i.GetImages(item, type.Value, cancellationToken).ConfigureAwait(false); - return string.IsNullOrEmpty(preferredLanguage) ? result : - FilterImages(result, preferredLanguage); + return FilterImages(result, preferredLanguage); } else { var result = await i.GetAllImages(item, cancellationToken).ConfigureAwait(false); - - return string.IsNullOrEmpty(preferredLanguage) ? result : - FilterImages(result, preferredLanguage); + return FilterImages(result, preferredLanguage); } } catch (Exception ex) |
