diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-13 13:27:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-13 13:27:13 -0400 |
| commit | 8df1ebe49967ed96b85076bf4dbfbf761fb5268d (patch) | |
| tree | d13e5447fa0551a6f6ced8fb09ae6cad3786c0e9 /MediaBrowser.Providers | |
| parent | b6ca79b73fdae969773935068c175ace43ac778d (diff) | |
add new mirror mode
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ImageSaver.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Movies/MovieDbProvider.cs | 33 |
2 files changed, 17 insertions, 26 deletions
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs index 0e184d1632..12af93dbd1 100644 --- a/MediaBrowser.Providers/Manager/ImageSaver.cs +++ b/MediaBrowser.Providers/Manager/ImageSaver.cs @@ -71,10 +71,18 @@ namespace MediaBrowser.Providers.Manager var saveLocally = item.SupportsLocalMetadata && item.IsSaveLocalMetadataEnabled() && !item.IsOwnedItem && !(item is Audio); - if (item is IItemByName || item is User) + if (item is User) { saveLocally = true; } + if (item is IItemByName) + { + var hasDualAccess = item as IHasDualAccess; + if (hasDualAccess == null || hasDualAccess.IsAccessedByName) + { + saveLocally = true; + } + } if (type != ImageType.Primary && item is Episode) { diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 7a63713f19..c83e127ae5 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -139,8 +139,6 @@ namespace MediaBrowser.Providers.Movies /// </summary> private TmdbSettingsResult _tmdbSettings; - private readonly SemaphoreSlim _tmdbSettingsSemaphore = new SemaphoreSlim(1, 1); - /// <summary> /// Gets the TMDB settings. /// </summary> @@ -152,32 +150,17 @@ namespace MediaBrowser.Providers.Movies return _tmdbSettings; } - await _tmdbSettingsSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); - - try + using (var json = await GetMovieDbResponse(new HttpRequestOptions { - // Check again in case it got populated while we were waiting. - if (_tmdbSettings != null) - { - return _tmdbSettings; - } - - using (var json = await GetMovieDbResponse(new HttpRequestOptions - { - Url = string.Format(TmdbConfigUrl, ApiKey), - CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader - - }).ConfigureAwait(false)) - { - _tmdbSettings = _jsonSerializer.DeserializeFromStream<TmdbSettingsResult>(json); + Url = string.Format(TmdbConfigUrl, ApiKey), + CancellationToken = cancellationToken, + AcceptHeader = AcceptHeader - return _tmdbSettings; - } - } - finally + }).ConfigureAwait(false)) { - _tmdbSettingsSemaphore.Release(); + _tmdbSettings = _jsonSerializer.DeserializeFromStream<TmdbSettingsResult>(json); + + return _tmdbSettings; } } |
