replaced http client cache with longer lived cache

13 files changed, 159 insertions, 32 deletions

diff --git a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
index fc50254cf..aebc4a234 100644
--- a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
@@ -121,7 +121,14 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var xml = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = FanArtResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     doc.Load(xml);
                 }
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index 50aed5d3f..a51044905 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -174,7 +174,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = string.Format(TmdbConfigUrl, ApiKey),
                     CancellationToken = CancellationToken.None,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -546,7 +547,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url3,
                     CancellationToken = cancellationToken,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -585,7 +587,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                         Url = url3,
                         CancellationToken = cancellationToken,
                         ResourcePool = Current.MovieDbResourcePool,
-                        AcceptHeader = AcceptHeader
+                        AcceptHeader = AcceptHeader,
+                        EnableResponseCache = true
 
                     }).ConfigureAwait(false))
                     {
@@ -631,7 +634,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                                 Url = url3,
                                 CancellationToken = cancellationToken,
                                 ResourcePool = Current.MovieDbResourcePool,
-                                AcceptHeader = AcceptHeader
+                                AcceptHeader = AcceptHeader,
+                                EnableResponseCache = true
 
                             }).ConfigureAwait(false))
                             {
@@ -720,7 +724,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                         Url = url,
                         CancellationToken = cancellationToken,
                         ResourcePool = Current.MovieDbResourcePool,
-                        AcceptHeader = AcceptHeader
+                        AcceptHeader = AcceptHeader,
+                        EnableResponseCache = true
 
                     }).ConfigureAwait(false))
                     {
@@ -828,7 +833,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -867,7 +873,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                             Url = url,
                             CancellationToken = cancellationToken,
                             ResourcePool = Current.MovieDbResourcePool,
-                            AcceptHeader = AcceptHeader
+                            AcceptHeader = AcceptHeader,
+                            EnableResponseCache = true
 
                         }).ConfigureAwait(false))
                         {
@@ -910,7 +917,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -944,7 +952,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -980,7 +989,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = Current.MovieDbResourcePool,
-                    AcceptHeader = AcceptHeader
+                    AcceptHeader = AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
diff --git a/MediaBrowser.Controller/Providers/Movies/RottenTomatoesMovieProvider.cs b/MediaBrowser.Controller/Providers/Movies/RottenTomatoesMovieProvider.cs
index a490a18e7..d306cc0a6 100644
--- a/MediaBrowser.Controller/Providers/Movies/RottenTomatoesMovieProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/RottenTomatoesMovieProvider.cs
@@ -186,7 +186,14 @@ namespace MediaBrowser.Controller.Providers.Movies
             RTMovieSearchResult hit = null;
 
             // Have IMDB Id
-            using (var stream = await HttpClient.Get(GetMovieImdbUrl(imdbId), _rottenTomatoesResourcePool, cancellationToken).ConfigureAwait(false))
+            using (var stream = await HttpClient.Get(new HttpRequestOptions
+            {
+                Url = GetMovieImdbUrl(imdbId),
+                ResourcePool = _rottenTomatoesResourcePool,
+                CancellationToken = cancellationToken,
+                EnableResponseCache = true
+
+            }).ConfigureAwait(false))
             {
                 var result = JsonSerializer.DeserializeFromStream<RTMovieSearchResult>(stream);
 
@@ -203,7 +210,14 @@ namespace MediaBrowser.Controller.Providers.Movies
                 item.CriticRatingSummary = hit.critics_consensus;
                 item.CriticRating = float.Parse(hit.ratings.critics_score);
 
-                using (var stream = await HttpClient.Get(GetMovieReviewsUrl(hit.id), _rottenTomatoesResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var stream = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = GetMovieReviewsUrl(hit.id),
+                    ResourcePool = _rottenTomatoesResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
 
                     var result = JsonSerializer.DeserializeFromStream<RTReviewList>(stream);
diff --git a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
index 7aae0c0b9..03c5b1fa8 100644
--- a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
@@ -168,7 +168,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = MovieDbProvider.Current.MovieDbResourcePool,
-                    AcceptHeader = MovieDbProvider.AcceptHeader
+                    AcceptHeader = MovieDbProvider.AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -201,7 +202,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = MovieDbProvider.Current.MovieDbResourcePool,
-                    AcceptHeader = MovieDbProvider.AcceptHeader
+                    AcceptHeader = MovieDbProvider.AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
@@ -286,7 +288,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = MovieDbProvider.Current.MovieDbResourcePool,
-                    AcceptHeader = MovieDbProvider.AcceptHeader
+                    AcceptHeader = MovieDbProvider.AcceptHeader,
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
diff --git a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
index 96717fe3f..23960a34f 100644
--- a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
@@ -141,7 +141,14 @@ namespace MediaBrowser.Controller.Providers.Music
 
             try
             {
-                using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var xml = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = FanArtResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     doc.Load(xml);
                 }
@@ -243,7 +250,8 @@ namespace MediaBrowser.Controller.Providers.Music
                     Url = url,
                     CancellationToken = cancellationToken,
                     ResourcePool = _musicBrainzSemaphore,
-                    UserAgent = "MediaBrowserServer/www.mediabrowser3.com"
+                    UserAgent = "MediaBrowserServer/www.mediabrowser3.com",
+                    EnableResponseCache = true
 
                 }).ConfigureAwait(false))
                 {
diff --git a/MediaBrowser.Controller/Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/FanArtArtistProvider.cs
index 320acb701..2396ef6b9 100644
--- a/MediaBrowser.Controller/Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/FanArtArtistProvider.cs
@@ -117,7 +117,14 @@ namespace MediaBrowser.Controller.Providers.Music
 
             try
             {
-                using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var xml = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = FanArtResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     doc.Load(xml);
                 }
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs
index 4fe815625..8ee2f4a26 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs
@@ -108,7 +108,14 @@ namespace MediaBrowser.Controller.Providers.Music
             // Get albu info using artist and album name
             var url = RootUrl + string.Format("method=album.getInfo&artist={0}&album={1}&api_key={2}&format=json", UrlEncode(artist), UrlEncode(album), ApiKey);
 
-            using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
+            using (var json = await HttpClient.Get(new HttpRequestOptions
+            {
+                Url = url,
+                ResourcePool = LastfmResourcePool,
+                CancellationToken = cancellationToken,
+                EnableResponseCache = true
+
+            }).ConfigureAwait(false))
             {
                 return JsonSerializer.DeserializeFromStream<LastfmGetAlbumResult>(json);
             }
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistByNameProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistByNameProvider.cs
index f9ec2cc74..72ee76598 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmArtistByNameProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistByNameProvider.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
@@ -20,8 +21,8 @@ namespace MediaBrowser.Controller.Providers.Music
         /// <param name="logManager">The log manager.</param>
         /// <param name="configurationManager">The configuration manager.</param>
         /// <param name="providerManager">The provider manager.</param>
-        public LastfmArtistByNameProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager, IProviderManager providerManager)
-            : base(jsonSerializer, httpClient, logManager, configurationManager, providerManager)
+        public LastfmArtistByNameProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager, IProviderManager providerManager, ILibraryManager libraryManager)
+            : base(jsonSerializer, httpClient, logManager, configurationManager, providerManager, libraryManager)
         {
         }
 
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
index d218642f1..dc73b5ae1 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
@@ -100,7 +100,14 @@ namespace MediaBrowser.Controller.Providers.Music
 
             try
             {
-                using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var json = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = LastfmResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     searchResult = JsonSerializer.DeserializeFromStream<LastfmArtistSearchResults>(json);
                 }
@@ -180,7 +187,14 @@ namespace MediaBrowser.Controller.Providers.Music
 
             LastfmGetArtistResult result;
 
-            using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
+            using (var json = await HttpClient.Get(new HttpRequestOptions
+            {
+                Url = url,
+                ResourcePool = LastfmResourcePool,
+                CancellationToken = cancellationToken,
+                EnableResponseCache = true
+
+            }).ConfigureAwait(false))
             {
                 result = JsonSerializer.DeserializeFromStream<LastfmGetArtistResult>(json);
             }
diff --git a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
index 26053a39d..7b7224ef4 100644
--- a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
@@ -76,7 +76,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
             try
             {
-                using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var xml = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = FanArtResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     doc.Load(xml);
                 }
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
index d7fa851d2..efa4b1f0c 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
@@ -185,7 +185,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var result = await HttpClient.Get(url, RemoteSeriesProvider.Current.TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                    using (var result = await HttpClient.Get(new HttpRequestOptions
+                    {
+                        Url = url,
+                        ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool,
+                        CancellationToken = cancellationToken,
+                        EnableResponseCache = true
+
+                    }).ConfigureAwait(false))
                     {
                         doc.Load(result);
                     }
@@ -203,7 +210,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
                     try
                     {
-                        using (var result = await HttpClient.Get(url, RemoteSeriesProvider.Current.TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                        using (var result = await HttpClient.Get(new HttpRequestOptions
+                        {
+                            Url = url,
+                            ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool,
+                            CancellationToken = cancellationToken,
+                            EnableResponseCache = true
+
+                        }).ConfigureAwait(false))
                         {
                             if (result != null) doc.Load(result);
                             usingAbsoluteData = true;
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
index a30b8f83f..e3a5d459d 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
@@ -149,7 +149,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
                     try
                     {
-                        using (var imgs = await HttpClient.Get(url, RemoteSeriesProvider.Current.TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                        using (var imgs = await HttpClient.Get(new HttpRequestOptions
+                        {
+                            Url = url,
+                            ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool,
+                            CancellationToken = cancellationToken,
+                            EnableResponseCache = true
+
+                        }).ConfigureAwait(false))
                         {
                             images.Load(imgs);
                         }
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
index 0b35b561b..33d56ea53 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
@@ -202,7 +202,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var xml = await HttpClient.Get(url, TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                    using (var xml = await HttpClient.Get(new HttpRequestOptions
+                    {
+                        Url = url,
+                        ResourcePool = TvDbResourcePool,
+                        CancellationToken = cancellationToken,
+                        EnableResponseCache = true
+
+                    }).ConfigureAwait(false))
                     {
                         doc.Load(xml);
                     }
@@ -294,7 +301,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
             try
             {
-                using (var actors = await HttpClient.Get(urlActors, TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var actors = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = urlActors,
+                    ResourcePool = TvDbResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     docActors.Load(actors);
                 }
@@ -366,7 +380,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var imgs = await HttpClient.Get(url, TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                    using (var imgs = await HttpClient.Get(new HttpRequestOptions
+                    {
+                        Url = url,
+                        ResourcePool = TvDbResourcePool,
+                        CancellationToken = cancellationToken,
+                        EnableResponseCache = true
+
+                    }).ConfigureAwait(false))
                     {
                         images.Load(imgs);
                     }
@@ -513,7 +534,14 @@ namespace MediaBrowser.Controller.Providers.TV
 
             try
             {
-                using (var results = await HttpClient.Get(url, TvDbResourcePool, cancellationToken).ConfigureAwait(false))
+                using (var results = await HttpClient.Get(new HttpRequestOptions
+                {
+                    Url = url,
+                    ResourcePool = TvDbResourcePool,
+                    CancellationToken = cancellationToken,
+                    EnableResponseCache = true
+
+                }).ConfigureAwait(false))
                 {
                     doc.Load(results);
                 }