mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-05 08:32:42 +02:00
Code Issues Releases Wiki Activity

Make Tomahawk link handling cleaner and less hackish (lfranchi++). Move openLinkFromHash to GlobalActionManager, to keep Tomahawk link handling simple.

Browse Source
This commit is contained in:
Alejandro Wainzinger 2011-06-07 18:12:38 -07:00
parent 3ec9308916
commit b392151c56
5 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libtomahawk/globalactionmanager.cpp
View File

@ -60,7 +60,6 @@ GlobalActionManager::~GlobalActionManager()
QUrl
GlobalActionManager::openLinkFromQuery( const Tomahawk::query_ptr& query ) const
{
QUrl link( "tomahawk://open/track/" );
QString title, artist, album;
if( !query->results().isEmpty() && !query->results().first().isNull() )
@ -75,6 +74,30 @@ GlobalActionManager::openLinkFromQuery( const Tomahawk::query_ptr& query ) const
album = query->album();
}
return openLink( title, artist, album );
}
QUrl
GlobalActionManager::openLinkFromHash( const Tomahawk::InfoSystem::InfoCriteriaHash& hash ) const
{
QString title, artist, album;
if( !hash.isEmpty() && hash.contains( "title" ) && hash.contains( "artist" ) )
{
title = hash["title"];
artist = hash["artist"];
if( hash.contains( "album" ) )
album = hash["album"];
}
return openLink( title, artist, album );
}
QUrl
GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album ) const
{
QUrl link( "tomahawk://open/track/" );
if( !title.isEmpty() )
link.addQueryItem( "title", title );
if( !artist.isEmpty() )
@ -165,13 +188,12 @@ GlobalActionManager::copyToClipboard( const Tomahawk::query_ptr& query ) const
bool
GlobalActionManager::parseTomahawkLink( const QString& url )
{
QString decodedUrl = QString::fromUtf8( QByteArray::fromPercentEncoding( url.toAscii() ).data() );
if( decodedUrl.contains( "tomahawk://" ) ) {
QString cmd = decodedUrl.mid( 11 );
if( url.contains( "tomahawk://" ) ) {
QString cmd = url.mid( 11 );
qDebug() << "Parsing tomahawk link command" << cmd;
QString cmdType = cmd.split( "/" ).first();
QUrl u( cmd );
QUrl u = QUrl::fromEncoded( cmd.toUtf8() );
// for backwards compatibility
if( cmdType == "load" ) {

4
src/libtomahawk/globalactionmanager.h
View File

@ -23,6 +23,7 @@
#include "playlist.h"
#include "query.h"
#include "playlist/dynamic/DynamicPlaylist.h"
#include "infosystem/infosystem.h"
#include "dllmacro.h"
#include <QObject>
@ -36,6 +37,7 @@ public:
virtual ~GlobalActionManager();
QUrl openLinkFromQuery( const Tomahawk::query_ptr& query ) const;
QUrl openLinkFromHash( const Tomahawk::InfoSystem::InfoCriteriaHash& hash ) const;
void copyToClipboard( const Tomahawk::query_ptr& query ) const;
QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist );
@ -68,6 +70,8 @@ private:
bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
QUrl openLink( const QString& title, const QString& artist, const QString& album ) const;
Tomahawk::playlist_ptr m_toShow;
Tomahawk::query_ptr m_waitingToBookmark;
Tomahawk::query_ptr m_waitingToPlay;

3
src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp
View File

@ -22,6 +22,7 @@
#include "artist.h"
#include "result.h"
#include "tomahawksettings.h"
#include "globalactionmanager.h"
#include "adiumplugin.h"
#include "adium.h"
@ -139,7 +140,7 @@ AdiumPlugin::audioStarted( const QVariant &input )
nowPlaying.append(" - ");
nowPlaying.append( hash["artist"] );
nowPlaying.append( " " );
nowPlaying.append( openLinkFromHash( hash ).toString() );
nowPlaying.append( GlobalActionManager::instance()->openLinkFromHash( hash ).toEncoded() );
setStatus( nowPlaying );
}

28
src/libtomahawk/infosystem/infosystem.cpp
View File

@ -44,34 +44,6 @@ InfoPlugin::~InfoPlugin()
qDebug() << Q_FUNC_INFO;
}
QUrl
InfoPlugin::openLinkFromHash( const InfoCriteriaHash& hash ) const
{
QUrl link( "tomahawk://open/track/" );
QString title, artist, album;
if( !hash.isEmpty() && hash.contains( "title" ) && hash.contains( "artist" ) )
{
title = hash["title"];
artist = hash["artist"];
if( hash.contains( "album" ) )
qDebug() << "Album is: " << album;
album = hash["album"];
}
if( !title.isEmpty() )
link.addEncodedQueryItem( "title", QUrl::toPercentEncoding( title ) );
if( !artist.isEmpty() )
link.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artist ) );
if( !album.isEmpty() )
link.addEncodedQueryItem( "album", QUrl::toPercentEncoding( album ) );
// Add encoding for spaces, since QUrl does not
QUrl encodedLink( link.toString().replace(" ", "%20"), QUrl::StrictMode );
return encodedLink;
}
InfoSystem* InfoSystem::s_instance = 0;
InfoSystem*

2
src/libtomahawk/infosystem/infosystem.h
View File

@ -134,8 +134,6 @@ protected slots:
virtual void namChangedSlot( QNetworkAccessManager *nam ) = 0;
protected:
QUrl openLinkFromHash( const InfoCriteriaHash& hash ) const;
InfoType m_type;
QSet< InfoType > m_supportedGetTypes;
QSet< InfoType > m_supportedPushTypes;