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

support spotifyURL and spotifyURI in track/open, track/queue, and track/play links

Browse Source
This commit is contained in:
Leo Franchi
2011-08-07 17:43:27 -04:00
parent dcf1ebb70f
commit 44aa85b51e
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/libtomahawk/globalactionmanager.cpp
View File

@@ -346,6 +346,10 @@ bool
GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems )
{
if( parts.size() && parts[ 0 ] == "track" ) {
if( queueSpotify( parts, queryItems ) )
return true;
QPair< QString, QString > pair;
QString title, artist, album, urlStr;
@@ -394,6 +398,28 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q
return false;
}
bool
GlobalActionManager::queueSpotify( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
{
QString url;
QPair< QString, QString > pair;
foreach( pair, queryItems ) {
if( pair.first == "spotifyURL" )
url = pair.second;
else if( pair.first == "spotifyURI" )
url = pair.second;
}
if( url.isEmpty() )
return false;
openSpotifyLink( url );
return true;
}
bool
GlobalActionManager::handleSearchCommand( const QUrl& url )
{
@@ -581,6 +607,9 @@ GlobalActionManager::handlePlayCommand( const QUrl& url )
}
if( parts[ 0 ] == "track" ) {
if( playSpotify( url ) )
return true;
QPair< QString, QString > pair;
QString title, artist, album, urlStr;
foreach( pair, url.queryItems() ) {
@@ -607,6 +636,29 @@ GlobalActionManager::handlePlayCommand( const QUrl& url )
return false;
}
bool
GlobalActionManager::playSpotify( const QUrl& url )
{
if( !url.hasQueryItem( "spotifyURI" ) && !url.hasQueryItem( "spotifyURL" ) )
return false;
QString spotifyUrl = url.hasQueryItem( "spotifyURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "spotifyURL" );
SpotifyParser* p = new SpotifyParser( spotifyUrl, this );
connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( spotifyToPlay( Tomahawk::query_ptr ) ) );
return true;
}
void
GlobalActionManager::spotifyToPlay( const query_ptr& q )
{
Pipeline::instance()->resolve( q, true );
m_waitingToPlay = q;
connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
}
bool GlobalActionManager::handleBookmarkCommand(const QUrl& url)
{
QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command

5
src/libtomahawk/globalactionmanager.h
View File

@@ -77,6 +77,8 @@ private slots:
void xspfCreated( const QByteArray& xspf );
void expandedUrls( QStringList );
void spotifyToPlay( const Tomahawk::query_ptr& );
private:
explicit GlobalActionManager( QObject* parent = 0 );
void doBookmark( const Tomahawk::playlist_ptr& pl, const Tomahawk::query_ptr& q );
@@ -93,6 +95,9 @@ private:
bool handleOpenCommand(const QUrl& url );
bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
bool playSpotify( const QUrl& url );
bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
/// handle parsing mime data
void handleTrackUrls( const QString& urls );
QList< Tomahawk::query_ptr > tracksFromQueryList( const QMimeData* d );