mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-18 23:09:42 +01:00
Code Issues Releases Wiki Activity

Support album covers in script info plugins

Browse Source
This commit is contained in:
Dominik Schmidt 2015-04-06 03:17:33 +02:00
parent c36bd64a01
commit a2729695ba
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/libtomahawk/resolvers/ScriptInfoPlugin.cpp
View File

@ -25,6 +25,7 @@
#include "../utils/Logger.h"
#include "../utils/Json.h"
#include "../utils/NetworkAccessManager.h"
using namespace Tomahawk;
@ -145,22 +146,79 @@ ScriptInfoPlugin::onNotInCacheRequestDone( const QVariantMap& result )
Q_D( ScriptInfoPlugin );
ScriptJob* job = qobject_cast< ScriptJob* >( sender() );
sender()->deleteLater();
// retrieve requestData from cache and delete it
Tomahawk::InfoSystem::InfoRequestData requestData = d->requestDataCache[ job->id().toInt() ];
d->requestDataCache.remove( job->id().toInt() );
emit info( requestData, result[ "data" ].toMap() );
// retrieve criteria from cache and delete it
Tomahawk::InfoSystem::InfoStringHash criteria = d->criteriaCache[ job->id().toInt() ];
d->criteriaCache.remove( job->id().toInt() );
emit updateCache( criteria, result[ "maxAge" ].toLongLong(), requestData.type, result[ "data" ].toMap() );
sender()->deleteLater();
QVariantMap resultData = result[ "data" ].toMap();
switch ( requestData.type )
{
case InfoSystem::InfoAlbumCoverArt:
{
QNetworkRequest req( resultData[ "url" ].toUrl() );
QNetworkReply* reply = Tomahawk::Utils::nam()->get( req );
reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
reply->setProperty( "criteria", convertInfoStringHashToQVariantMap( criteria ) );
reply->setProperty( "maxAge", result[ "maxAge" ] );
connect( reply, SIGNAL( finished() ), SLOT( onCoverArtReturned() ) );
}
break;
default:
{
emit info( requestData, result[ "data" ].toMap() );
emit updateCache( criteria, result[ "maxAge" ].toLongLong(), requestData.type, resultData );
break;
}
};
}
void
ScriptInfoPlugin::onCoverArtReturned()
{
QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
reply->deleteLater();
QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
if ( redir.isEmpty() )
{
Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
Tomahawk::InfoSystem::InfoStringHash criteria = convertQVariantMapToInfoStringHash( reply->property( "criteria" ).toMap() );
QByteArray ba = reply->readAll();
if ( ba.isNull() || ba.isEmpty() )
{
tLog() << Q_FUNC_INFO << "Null byte array for cover of" << criteria["artist"] << criteria["album"];
emit info( requestData, QVariant() );
return;
}
QVariantMap returnedData;
returnedData["imgbytes"] = ba;
returnedData["url"] = reply->url().toString();
emit info( requestData, returnedData );
emit updateCache( criteria, reply->property( "maxAge" ).toLongLong(), requestData.type, returnedData );
}
else
{
// Follow HTTP redirect
QNetworkRequest req( redir );
QNetworkReply* newReply = Tomahawk::Utils::nam()->get( req );
newReply->setProperty( "requestData", reply->property( "requestData" ) );
newReply->setProperty( "criteria", reply->property( "criteria" ) );
newReply->setProperty( "maxAge", reply->property( "maxAge" ) );
connect( newReply, SIGNAL( finished() ), SLOT( onCoverArtReturned() ) );
}
}
QSet< Tomahawk::InfoSystem::InfoType >
ScriptInfoPlugin::parseSupportedTypes( const QVariant& variant )

1
src/libtomahawk/resolvers/ScriptInfoPlugin.h
View File

@ -53,6 +53,7 @@ protected slots:
void onGetInfoRequestDone( const QVariantMap& result );
void onNotInCacheRequestDone( const QVariantMap& result );
void onCoverArtReturned();
// boilerplate: to be removed with Qt5 (can be put into ScriptPlugin)
void onScriptObjectDeleted();