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

Add tracks to ScriptCollection.

Browse Source
This commit is contained in:
Teo Mrnjavac 2013-01-27 19:45:23 +01:00
parent 29cdcec3c6
commit 9c5118c49a
3 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/libtomahawk/resolvers/QtScriptResolver.cpp
View File

@ -192,6 +192,46 @@ QtScriptResolverHelper::addAlbumResults( const QVariantMap& results )
}
void
QtScriptResolverHelper::addAlbumTrackResults( const QVariantMap& results )
{
qDebug() << "Resolver reporting album tracks:" << results;
QString artistName = results.value( "artist" ).toString();
if ( artistName.trimmed().isEmpty() )
return;
QString albumName = results.value( "album" ).toString();
if ( albumName.trimmed().isEmpty() )
return;
Tomahawk::artist_ptr artist = Tomahawk::Artist::get( artistName, false );
Tomahawk::album_ptr album = Tomahawk::Album::get( artist, albumName, false );
QList< Tomahawk::result_ptr > tracks = m_resolver->parseResultVariantList( results.value("results").toList() );
QString qid = results.value("qid").toString();
Tomahawk::collection_ptr collection = Tomahawk::collection_ptr();
foreach ( const Tomahawk::collection_ptr& coll, m_resolver->collections() )
{
if ( coll->name() == qid )
{
collection = coll;
}
}
if ( collection.isNull() )
return;
QList< Tomahawk::query_ptr > queries;
foreach ( const Tomahawk::result_ptr& result, tracks )
queries.append( result->toQuery() );
tDebug() << Q_FUNC_INFO << "about to push" << tracks.count() << "tracks";
QMetaObject::invokeMethod( collection.data(), "onTracksFetched", Qt::QueuedConnection,
Q_ARG( QList< Tomahawk::query_ptr >, queries ) );
}
void
QtScriptResolverHelper::setResolverConfig( const QVariantMap& config )
{
@ -518,6 +558,37 @@ QtScriptResolver::albums( const Tomahawk::collection_ptr& collection, const Toma
void
QtScriptResolver::tracks( const Tomahawk::collection_ptr& collection, const Tomahawk::album_ptr& album )
{
if ( QThread::currentThread() != thread() )
{
QMetaObject::invokeMethod( this, "tracks", Qt::QueuedConnection,
Q_ARG( Tomahawk::collection_ptr, collection ),
Q_ARG( Tomahawk::album_ptr, album ) );
return;
}
if ( !m_collections.contains( collection->name() ) || //if the collection doesn't belong to this resolver
!capabilities().testFlag( Browsable ) ) //or this resolver doesn't even support collections
{
QMetaObject::invokeMethod( collection.data(), "onTracksFetched", Qt::QueuedConnection,
Q_ARG( QList< Tomahawk::query_ptr >, QList< Tomahawk::query_ptr >() ) );
return;
}
QString eval = QString( "resolver.tracks( '%1', '%2', '%3' );" )
.arg( collection->name().replace( "'", "\\'" ) )
.arg( album->artist()->name().replace( "'", "\\'" ) )
.arg( album->name().replace( "'", "\\'" ) );
QVariantMap m = m_engine->mainFrame()->evaluateJavaScript( eval ).toMap();
if ( m.isEmpty() )
{
// if the resolver doesn't return anything, async api is used
return;
}
qDebug() << "Tracks JavaScript Result:" << m;
m_resolverHelper->addAlbumTrackResults( m );
}

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

@ -74,6 +74,7 @@ public slots:
void addArtistResults( const QVariantMap& results );
void addAlbumResults( const QVariantMap& results );
void addAlbumTrackResults( const QVariantMap& results );
private:
QString m_scriptPath, m_urlCallback;

3
src/libtomahawk/resolvers/ScriptCollection.cpp
View File

@ -124,7 +124,7 @@ ScriptCollection::albums( const Tomahawk::artist_ptr& artist )
void
ScriptCollection::tracks( const Tomahawk::album_ptr& album )
{
emit tracksResult( QList< Tomahawk::query_ptr >() );
m_resolver->tracks( m_resolver->collections().value( name() ), album );
}
@ -145,4 +145,5 @@ ScriptCollection::onAlbumsFetched( const QList<album_ptr>& albums )
void
ScriptCollection::onTracksFetched( const QList<query_ptr>& tracks )
{
emit tracksResult( tracks );
}