aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-07 09:06:01 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-07 09:06:01 -0400
commit2818d8ccd231039aa01e9b0bfedd59c48a656342 (patch)
tree45bf073ddc71ea80f3da9194132af9eb5246cb65 /MediaBrowser.Controller
parent049ffa2b4ef6298ac36f1c92fa9f35a7b68ad3e2 (diff)
updated servicestack to 3.9.44
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs4
-rw-r--r--MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs17
-rw-r--r--MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs2
3 files changed, 13 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index 4d60aa517..8b083f647 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 dc73b5ae1..0e56b8c08 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 3d4a49544..54fe32959 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Providers.Music
/// </summary>
public abstract class LastfmBaseProvider : BaseMetadataProvider
{
- protected static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5);
+ protected static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(4, 4);
/// <summary>
/// Initializes a new instance of the <see cref="LastfmBaseProvider" /> class.