aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs11
-rw-r--r--MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs5
2 files changed, 10 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
index 5203b6f06..ba32ba9e6 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
@@ -6,6 +6,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Logging;
@@ -16,8 +17,10 @@ namespace MediaBrowser.Controller.Providers.Music
{
public class LastfmArtistProvider : LastfmBaseArtistProvider
{
- public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
- : base(jsonSerializer, httpClient, logManager)
+ internal readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5);
+
+ public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
+ : base(jsonSerializer, httpClient, logManager, configurationManager)
{
}
@@ -30,7 +33,7 @@ namespace MediaBrowser.Controller.Providers.Music
try
{
- using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+ using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
{
searchResult = JsonSerializer.DeserializeFromStream<LastfmArtistSearchResults>(json);
}
@@ -61,7 +64,7 @@ namespace MediaBrowser.Controller.Providers.Music
try
{
- using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.Lastfm, cancellationToken).ConfigureAwait(false))
+ using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
{
result = JsonSerializer.DeserializeFromStream<LastfmGetArtistResult>(json);
}
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
index 85f141a56..444c0fefd 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
@@ -5,6 +5,7 @@ using System.Net;
using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
@@ -14,8 +15,8 @@ namespace MediaBrowser.Controller.Providers.Music
{
public abstract class LastfmBaseArtistProvider : LastfmBaseProvider
{
- protected LastfmBaseArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
- : base(jsonSerializer, httpClient, logManager)
+ protected LastfmBaseArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
+ : base(jsonSerializer, httpClient, logManager, configurationManager)
{
LocalMetaFileName = "MBArtist.json";
}