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

remove group filter from music brainz search

Browse Source
This commit is contained in:
Luke Pulverenti 2013-08-12 15:13:58 -04:00
parent 582edde742
commit dbcbadbc3d
1 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
MediaBrowser.Providers/Music/LastfmArtistProvider.cs
View File

@ -87,17 +87,6 @@ namespace MediaBrowser.Providers.Music
} }
} }
//// Try to find the id using last fm
//var result = await FindIdFromLastFm(item, cancellationToken).ConfigureAwait(false);
//if (result != null)
//{
// if (!string.IsNullOrEmpty(result))
// {
// return result;
// }
//}
try try
{ {
// If we don't get anything, go directly to music brainz // If we don't get anything, go directly to music brainz
@ -128,51 +117,6 @@ namespace MediaBrowser.Providers.Music
return artist != null ? artist.GetProviderId(MetadataProviders.Musicbrainz) : null; return artist != null ? artist.GetProviderId(MetadataProviders.Musicbrainz) : null;
} }
/// <summary>
/// Finds the id from last fm.
/// </summary>
/// <param name="item">The item.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{System.String}.</returns>
private async Task<string> FindIdFromLastFm(BaseItem item, CancellationToken cancellationToken)
{
//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);
using (var json = await HttpClient.Get(new HttpRequestOptions
{
Url = url,
ResourcePool = LastfmResourcePool,
CancellationToken = cancellationToken,
EnableHttpCompression = false
}).ConfigureAwait(false))
{
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 | CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0);
return artist == null ? null : artist.mbid;
}
}
}
return null;
}
/// <summary> /// <summary>
/// Finds the id from music brainz. /// Finds the id from music brainz.
/// </summary> /// </summary>
@ -190,7 +134,7 @@ namespace MediaBrowser.Providers.Music
var ns = new XmlNamespaceManager(doc.NameTable); var ns = new XmlNamespaceManager(doc.NameTable);
ns.AddNamespace("mb", "http://musicbrainz.org/ns/mmd-2.0#"); ns.AddNamespace("mb", "http://musicbrainz.org/ns/mmd-2.0#");
var node = doc.SelectSingleNode("//mb:artist-list/mb:artist[@type='Group']/@id", ns); var node = doc.SelectSingleNode("//mb:artist-list/mb:artist/@id", ns);
if (node != null && node.Value != null) if (node != null && node.Value != null)
{ {
@ -206,7 +150,7 @@ namespace MediaBrowser.Providers.Music
ns = new XmlNamespaceManager(doc.NameTable); ns = new XmlNamespaceManager(doc.NameTable);
ns.AddNamespace("mb", "http://musicbrainz.org/ns/mmd-2.0#"); ns.AddNamespace("mb", "http://musicbrainz.org/ns/mmd-2.0#");
node = doc.SelectSingleNode("//mb:artist-list/mb:artist[@type='Group']/@id", ns); node = doc.SelectSingleNode("//mb:artist-list/mb:artist/@id", ns);
if (node != null && node.Value != null) if (node != null && node.Value != null)
{ {