lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #157 - a handful of persistent artist have failure to download BIOs

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-10 13:12:50 -04:00
parent 2ea9b7e4eb
commit 2bb518027f
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
View File

@ -93,8 +93,6 @@ namespace MediaBrowser.Controller.Providers.Music
//Execute the Artist search against our name and assume first one is the one we want //Execute the Artist search against our name and assume first one is the one we want
var url = RootUrl + string.Format("method=artist.search&artist={0}&api_key={1}&format=json", UrlEncode(item.Name), ApiKey); var url = RootUrl + string.Format("method=artist.search&artist={0}&api_key={1}&format=json", UrlEncode(item.Name), ApiKey);
LastfmArtistSearchResults searchResult;
try try
{ {
using (var json = await HttpClient.Get(new HttpRequestOptions using (var json = await HttpClient.Get(new HttpRequestOptions
@ -106,22 +104,33 @@ namespace MediaBrowser.Controller.Providers.Music
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
searchResult = JsonSerializer.DeserializeFromStream<LastfmArtistSearchResults>(json); using (var reader = new StreamReader(json, true))
{
var jsonString = await reader.ReadToEndAsync().ConfigureAwait(false);
// Sometimes they send back an empty response or just the text "null"
if (!jsonString.StartsWith("{", StringComparison.OrdinalIgnoreCase))
{
return null;
}
var searchResult = JsonSerializer.DeserializeFromString<LastfmArtistSearchResults>(jsonString);
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();
return artist.mbid;
}
}
} }
} }
catch (HttpException e) catch (HttpException)
{ {
return null; return null;
} }
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();
return artist.mbid;
}
return null; return null;
} }
@ -167,7 +176,7 @@ namespace MediaBrowser.Controller.Providers.Music
{ {
return !string.Equals(text, RemoveDiacritics(text), StringComparison.Ordinal); return !string.Equals(text, RemoveDiacritics(text), StringComparison.Ordinal);
} }
private string RemoveDiacritics(string text) private string RemoveDiacritics(string text)
{ {
return string.Concat( return string.Concat(
@ -176,7 +185,7 @@ namespace MediaBrowser.Controller.Providers.Music
UnicodeCategory.NonSpacingMark) UnicodeCategory.NonSpacingMark)
).Normalize(NormalizationForm.FormC); ).Normalize(NormalizationForm.FormC);
} }
protected override async Task FetchLastfmData(BaseItem item, string id, CancellationToken cancellationToken) protected override async Task FetchLastfmData(BaseItem item, string id, CancellationToken cancellationToken)
{ {
// Get artist info with provided id // Get artist info with provided id
@ -212,7 +221,7 @@ namespace MediaBrowser.Controller.Providers.Music
} }
await _providerManager.SaveToLibraryFilesystem(item, Path.Combine(item.MetaLocation, LocalMetaFileName), ms, cancellationToken).ConfigureAwait(false); await _providerManager.SaveToLibraryFilesystem(item, Path.Combine(item.MetaLocation, LocalMetaFileName), ms, cancellationToken).ConfigureAwait(false);
} }
} }
} }