aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-21 12:53:03 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-21 12:53:03 -0400
commite036b2c416f9b6655ed668701a7aeb63653e4e23 (patch)
tree5758597f8c73789c120dfccda47347b53b88bb95
parente01202030dcd16cd9c7c3327b4e411be7de02614 (diff)
verify last fm data a little better
-rw-r--r--MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs2
-rw-r--r--MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs9
2 files changed, 8 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
index 1744e96e6..5364ce541 100644
--- a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs
@@ -220,7 +220,7 @@ namespace MediaBrowser.Controller.Providers.Music
{
Url = url,
CancellationToken = cancellationToken,
- UserAgent = "MediaBrowserServer/www.mediabrowser3.com",
+ UserAgent = Environment.MachineName + "-" + Environment.UserName,
EnableResponseCache = true
}).ConfigureAwait(false))
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
index ed2a09a4f..8461b84bb 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
@@ -117,8 +117,13 @@ namespace MediaBrowser.Controller.Providers.Music
if (searchResult != null && searchResult.results != null && searchResult.results.artistmatches != null && searchResult.results.artistmatches.artist.Count > 0)
{
- var artist = searchResult.results.artistmatches.artist.FirstOrDefault(i => i.name != null && string.Compare(i.name, item.Name, CultureInfo.CurrentCulture, CompareOptions.IgnoreNonSpace) == 0) ??
- searchResult.results.artistmatches.artist.First();
+ var artist = searchResult.results.artistmatches.artist
+ .FirstOrDefault(i => i.name != null && string.Compare(i.name, item.Name, CultureInfo.CurrentCulture, CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0);
+
+ if (artist == null)
+ {
+ return null;
+ }
return artist.mbid;
}