From 2818d8ccd231039aa01e9b0bfedd59c48a656342 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 7 May 2013 09:06:01 -0400 Subject: updated servicestack to 3.9.44 --- .../Providers/Movies/MovieDbProvider.cs | 4 ++-- .../Providers/Music/LastfmArtistProvider.cs | 17 ++++++++++------- .../Providers/Music/LastfmBaseProvider.cs | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index 4d60aa5175..8b083f6474 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -975,8 +975,8 @@ namespace MediaBrowser.Controller.Providers.Movies boxset.OfficialRating = firstChild != null ? firstChild.OfficialRating : null; } - if (movie.RunTimeTicks == null && movieData.runtime > 0) - movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks; + //if (movie.RunTimeTicks == null && movieData.runtime > 0) + // movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks; //studios if (movieData.production_companies != null) diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs index dc73b5ae1d..0e56b8c08c 100644 --- a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs +++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs @@ -55,15 +55,18 @@ namespace MediaBrowser.Controller.Providers.Music // Try to find the id using last fm var result = await FindIdFromLastFm(item, cancellationToken).ConfigureAwait(false); - if (!string.IsNullOrEmpty(result.Item1)) + if (result != null) { - return result.Item1; - } + if (!string.IsNullOrEmpty(result.Item1)) + { + return result.Item1; + } - // If there were no artists returned at all, then don't bother with musicbrainz - if (!result.Item2) - { - return null; + // If there were no artists returned at all, then don't bother with musicbrainz + if (!result.Item2) + { + return null; + } } try diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs index 3d4a495440..54fe329597 100644 --- a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs +++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Providers.Music /// public abstract class LastfmBaseProvider : BaseMetadataProvider { - protected static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5); + protected static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(4, 4); /// /// Initializes a new instance of the class. -- cgit v1.2.3