aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-11-12 13:47:38 -0500
committerLuke <luke.pulverenti@gmail.com>2015-11-12 13:47:38 -0500
commite6329c46d17eef31aeedff57a672830ed569873d (patch)
treed16d6fcf0bfb16c4278a4709bb25e9941ab91e5c
parent5571bc98f3353c538e82086cb956d6b2219f9276 (diff)
parent8d37d66fa526168668a51ad6cd83cf3c3588efc6 (diff)
Merge pull request #1260 from MediaBrowser/master
update movie db provider
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs21
1 files changed, 3 insertions, 18 deletions
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index a91714d32..fe3e1f358 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -160,9 +160,7 @@ namespace MediaBrowser.Providers.Movies
{
Url = string.Format(TmdbConfigUrl, ApiKey),
CancellationToken = cancellationToken,
- AcceptHeader = AcceptHeader,
- CacheMode = CacheMode.Unconditional,
- CacheLength = TimeSpan.FromDays(1)
+ AcceptHeader = AcceptHeader
}).ConfigureAwait(false))
{
@@ -368,27 +366,14 @@ namespace MediaBrowser.Providers.Movies
return mainResult;
}
- private static long _lastRequestTicks;
-
/// <summary>
/// Gets the movie db response.
/// </summary>
- internal async Task<Stream> GetMovieDbResponse(HttpRequestOptions options)
+ internal Task<Stream> GetMovieDbResponse(HttpRequestOptions options)
{
- var requestIntervalMs = 250;
- var delayTicks = (requestIntervalMs * 10000) - (DateTime.UtcNow.Ticks - _lastRequestTicks);
- var delayMs = Math.Min(delayTicks / 10000, requestIntervalMs);
-
- if (delayMs > 0)
- {
- _logger.Debug("Throttling Tmdb by {0} ms", delayMs);
- await Task.Delay(Convert.ToInt32(delayMs)).ConfigureAwait(false);
- }
-
options.ResourcePool = MovieDbResourcePool;
- _lastRequestTicks = DateTime.UtcNow.Ticks;
- return await _httpClient.Get(options).ConfigureAwait(false);
+ return _httpClient.Get(options);
}
public TheMovieDbOptions GetTheMovieDbOptions()