mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

musicbrainz info plugin: fix album retrieval by using release-groups and raise limit to 100 Also dont search for EPs in artistSearchSlot and remove Live Recordings, EPs and Compilations from found Albums

Browse Source
This commit is contained in:
Kilian Lackhove
2012-09-02 14:51:35 +02:00
parent 62c119d745
commit bc26c72c8c
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
View File

@@ -147,9 +147,11 @@ MusicBrainzPlugin::artistSearchSlot()
} }
QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" ); QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" ); QString requestString( "http://musicbrainz.org/ws/2/release-group" );
QUrl url( requestString ); QUrl url( requestString );
url.addQueryItem( "artist", artist_id ); url.addQueryItem( "artist", artist_id );
url.addQueryItem( "type", "album" );
url.addQueryItem( "limit", "100" );
QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) ); QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
newReply->setProperty( "requestData", oldReply->property( "requestData" ) ); newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
@@ -174,9 +176,11 @@ MusicBrainzPlugin::albumSearchSlot()
} }
QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" ); QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" ); QString requestString( "http://musicbrainz.org/ws/2/release-group" );
QUrl url( requestString ); QUrl url( requestString );
url.addQueryItem( "artist", artist_id ); url.addQueryItem( "artist", artist_id );
url.addQueryItem( "type", "album|ep" );
url.addQueryItem( "limit", "100" );
QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) ); QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
newReply->setProperty( "requestData", oldReply->property( "requestData" ) ); newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
@@ -236,19 +240,29 @@ MusicBrainzPlugin::albumFoundSlot()
QDomDocument doc; QDomDocument doc;
doc.setContent( reply->readAll() ); doc.setContent( reply->readAll() );
QDomNodeList domNodeList = doc.elementsByTagName( "title" ); QDomNodeList groups = doc.elementsByTagName( "release-group" );
if ( domNodeList.isEmpty() ) if ( groups.isEmpty() )
{ {
emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() ); emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
return; return;
} }
QStringList albums; QStringList albums;
for ( int i = 0; i < domNodeList.count(); i++ ) for ( int i = 0; i < groups.count(); i++ )
{ {
QString album = domNodeList.at( i ).toElement().text(); QDomElement group = groups.at(i).toElement();
if ( !albums.contains( album ) ) QDomNodeList secTypesDL = group.elementsByTagName("secondary-type");
albums << album; QStringList secTypesSL;
for ( int i = 0; i < secTypesDL.count(); i++ )
{
secTypesSL.append(secTypesDL.at(i).toElement().text());
}
if ( !secTypesSL.contains("Live") && !secTypesSL.contains("Ep") && !secTypesSL.contains("Compilation") )
{
QString album = group.firstChildElement("title").text();
if ( !albums.contains( album ) )
albums << album;
}
} }
Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(); Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();