Don't use property to track fulltextness of query

Add "Open Account Debugger" menu to ScriptAccounts in SettingsDialog

CMakeModules/NSIS.template.in

@@ -347,105 +347,108 @@ Section "${APPLICATION_NAME}" SEC_TOMAHAWK_PLAYER
     File "${QT_DLL_PATH}\icudata56.dll"
     File "${QT_DLL_PATH}\icui18n56.dll"
 
-   ;SQLite driver
-   SetOutPath "$INSTDIR\sqldrivers"
-   File "${SQLITE_DLL_PATH}\qsqlite.dll"
-   SetOutPath "$INSTDIR"
-   File "${MINGW_BIN}\libsqlite3-0.dll"
+    ;SQLite driver
+    SetOutPath "$INSTDIR\sqldrivers"
+    File "${SQLITE_DLL_PATH}\qsqlite.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libsqlite3-0.dll"
 
-   ;Qt platform plugins
-   SetOutPath "$INSTDIR\platforms"
-    File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
-   SetOutPath "$INSTDIR"
+    ;Qt platform plugins
+    SetOutPath "$INSTDIR\platforms"
+     File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
+    SetOutPath "$INSTDIR"
 
-   ;Image plugins
-   SetOutPath "$INSTDIR\imageformats"
-   File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
-   SetOutPath "$INSTDIR"
+    ;Image plugins
+    SetOutPath "$INSTDIR\imageformats"
+    File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
+    SetOutPath "$INSTDIR"
 
-   ;Qt qml plugins
-   SetOutPath "$INSTDIR\QtQuick.2"
-   File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
-   SetOutPath "$INSTDIR\QtQuick\Window.2"
-   File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
-   SetOutPath "$INSTDIR"
+    ;Qt qml plugins
+    SetOutPath "$INSTDIR\QtQuick.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
+    SetOutPath "$INSTDIR\QtQuick\Window.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
+    SetOutPath "$INSTDIR"
 
-   ;Cygwin/c++ stuff
-   File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
-   File "${MINGW_BIN}\libstdc++-6.dll"
+    ;Cygwin/c++ stuff
+    File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
+    File "${MINGW_BIN}\libstdc++-6.dll"
 
-   ;VLC
-   File "${VLC_BIN}\libvlc.dll"
-   File "${VLC_BIN}\libvlccore.dll"
-   SetOutPath "$INSTDIR\plugins"
-   File /r "${VLC_PLUGIN_PATH}\*.dll"
-   SetOutPath "$INSTDIR"
+    ;VLC
+    File "${VLC_BIN}\libvlc.dll"
+    File "${VLC_BIN}\libvlccore.dll"
+    SetOutPath "$INSTDIR\plugins"
+    File /r "${VLC_PLUGIN_PATH}\*.dll"
+    SetOutPath "$INSTDIR"
 
-   ; Other
-   File "${MINGW_BIN}\libtag.dll"
-   File "${MINGW_BIN}\libpng16-16.dll"
-   File "${MINGW_BIN}\libjpeg-8.dll"
-   File "${MINGW_BIN}\zlib1.dll"
-   File "${MINGW_BIN}\libfreetype-6.dll"
-   File "${MINGW_BIN}\libglib-2.0-0.dll"
-   File "${MINGW_BIN}\libharfbuzz-0.dll"
+    ; Other
+    File "${MINGW_BIN}\libtag.dll"
+    File "${MINGW_BIN}\libpng16-16.dll"
+    File "${MINGW_BIN}\libjpeg-8.dll"
+    File "${MINGW_BIN}\zlib1.dll"
+    File "${MINGW_BIN}\libfreetype-6.dll"
+    File "${MINGW_BIN}\libglib-2.0-0.dll"
+    File "${MINGW_BIN}\libharfbuzz-0.dll"
 
-   File "${MINGW_BIN}\libechonest5.dll"
-   File "${MINGW_BIN}\liblastfm5.dll"
-   File "${MINGW_BIN}\libquazip5.dll"
-   File "${MINGW_BIN}\libqt5keychain.dll"
+    ; ANGLE
+    File "${MINGW_BIN}\D3DCompiler_43.dll"
 
-   ; GnuTLS
-   File "${MINGW_BIN}\libgnutls-28.dll"
-   File "${MINGW_BIN}\libtasn1-6.dll"
-   File "${MINGW_BIN}\libgmp-10.dll"
-   File "${MINGW_BIN}\libhogweed-2-4.dll"
-   File "${MINGW_BIN}\libintl-8.dll"
-   File "${MINGW_BIN}\libnettle-4-6.dll"
-   File "${MINGW_BIN}\libp11-kit-0.dll"
-   File "${MINGW_BIN}\libffi-6.dll"
+    File "${MINGW_BIN}\libechonest5.dll"
+    File "${MINGW_BIN}\liblastfm5.dll"
+    File "${MINGW_BIN}\libquazip5.dll"
+    File "${MINGW_BIN}\libqt5keychain.dll"
 
-   ; Snorenotify
-   File "${MINGW_BIN}\SnoreToast.exe"
-   File "${MINGW_BIN}\libsnore-qt5.dll"
-   File "${MINGW_BIN}\libsnoresettings-qt5.dll"
-   File "${MINGW_BIN}\snoresettings.exe"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_growl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snarl.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snore.dll"
-   File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_windowstoast.dll"
+    ; GnuTLS
+    File "${MINGW_BIN}\libgnutls-28.dll"
+    File "${MINGW_BIN}\libtasn1-6.dll"
+    File "${MINGW_BIN}\libgmp-10.dll"
+    File "${MINGW_BIN}\libhogweed-4-1.dll"
+    File "${MINGW_BIN}\libintl-8.dll"
+    File "${MINGW_BIN}\libnettle-6-1.dll"
+    File "${MINGW_BIN}\libp11-kit-0.dll"
+    File "${MINGW_BIN}\libffi-6.dll"
 
-   ; Snoregrowl
-   File "${MINGW_BIN}\libsnoregrowl++.dll"
-   File "${MINGW_BIN}\libsnoregrowl.dll"
+    ; Snorenotify
+    File "${MINGW_BIN}\SnoreToast.exe"
+    File "${MINGW_BIN}\libsnore-qt5.dll"
+    File "${MINGW_BIN}\libsnoresettings-qt5.dll"
+    File "${MINGW_BIN}\snoresettings.exe"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_windowstoast.dll"
+
+    ; Snoregrowl
+    File "${MINGW_BIN}\libsnoregrowl++.dll"
+    File "${MINGW_BIN}\libsnoregrowl.dll"
 
    ; Jabber
-   File "${MINGW_BIN}\libjreen-qt5.dll"
-   File "${MINGW_BIN}\libidn-11.dll"
-   File "${MINGW_BIN}\libgsasl-7.dll"
-   File "${MINGW_BIN}\libqca-qt5.dll"
-   SetOutPath "$INSTDIR\crypto"
-   File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
-   SetOutPath "$INSTDIR"
-   File "${MINGW_BIN}\libssl-10.dll"
-   File "${MINGW_BIN}\libcrypto-10.dll"
+    File "${MINGW_BIN}\libjreen-qt5.dll"
+    File "${MINGW_BIN}\libidn-11.dll"
+    File "${MINGW_BIN}\libgsasl-7.dll"
+    File "${MINGW_BIN}\libqca-qt5.dll"
+    SetOutPath "$INSTDIR\crypto"
+    File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libssl-10.dll"
+    File "${MINGW_BIN}\libcrypto-10.dll"
 
-   ; LucenePlusPlus
-   File "${MINGW_BIN}\liblucene++.dll"
-   File "${MINGW_BIN}\libboost_system-mt.dll"
-   File "${MINGW_BIN}\libboost_filesystem-mt.dll"
-   File "${MINGW_BIN}\libboost_iostreams-mt.dll"
-   File "${MINGW_BIN}\libboost_regex-mt.dll"
-   File "${MINGW_BIN}\libboost_thread-mt.dll"
-   File "${MINGW_BIN}\libbz2-1.dll"
+    ; LucenePlusPlus
+    File "${MINGW_BIN}\liblucene++.dll"
+    File "${MINGW_BIN}\libboost_system-mt.dll"
+    File "${MINGW_BIN}\libboost_filesystem-mt.dll"
+    File "${MINGW_BIN}\libboost_iostreams-mt.dll"
+    File "${MINGW_BIN}\libboost_regex-mt.dll"
+    File "${MINGW_BIN}\libboost_thread-mt.dll"
+    File "${MINGW_BIN}\libbz2-1.dll"
 
-   File "${MINGW_BIN}\libqtsparkle-qt5.dll"
-   File "${MINGW_BIN}\libKF5Attica.dll"
+    File "${MINGW_BIN}\libqtsparkle-qt5.dll"
+    File "${MINGW_BIN}\libKF5Attica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"

TomahawkCPack.cmake

@@ -2,7 +2,7 @@ INCLUDE( InstallRequiredSystemLibraries )
 
 SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_APPLICATION_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
+SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_TARGET_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
 
 # CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
 # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable

data/js/tomahawk.js

@@ -273,19 +273,29 @@ Tomahawk.Resolver = {
     getStreamUrl: function (params) {
         return params;
     },
+    resolve: function() {
+    },
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },
 
     _adapter_search: function (params) {
         return RSVP.Promise.resolve(this.search(params)).then(function (results) {
-            return {
-                'tracks': results
-            };
+            if(Array.isArray(results)) {
+                return {
+                    'tracks': results
+                };
+            }
+
+            return results;
         });
     },
 

src/accounts/xmpp/XmppInfoPlugin.cpp

@@ -69,6 +69,13 @@ Tomahawk::InfoSystem::XmppInfoPlugin::init()
 }
 
 
+const QString
+Tomahawk::InfoSystem::XmppInfoPlugin::friendlyName() const
+{
+    return "xmpp";
+}
+
+
 void
 Tomahawk::InfoSystem::XmppInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
 {

src/accounts/xmpp/XmppInfoPlugin.h

@@ -38,6 +38,8 @@ namespace Tomahawk {
             XmppInfoPlugin(XmppSipPlugin* parent);
             virtual ~XmppInfoPlugin();
 
+            const QString friendlyName() const override;
+
         signals:
             void publishTune( QUrl url, Tomahawk::InfoSystem::InfoStringHash trackInfo );
 

src/accounts/xmpp/sip/XmppSip.cpp

@@ -194,9 +194,9 @@ InfoSystem::InfoPluginPtr
 XmppSipPlugin::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-        m_infoPlugin = QPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
+        m_infoPlugin = QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
 
-    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 
@@ -285,7 +285,7 @@ XmppSipPlugin::onConnect()
     // load XmppInfoPlugin
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 
@@ -359,7 +359,6 @@ XmppSipPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
     if ( !m_infoPlugin.isNull() )
     {
         Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
-        delete m_infoPlugin;
     }
 }
 

src/accounts/xmpp/sip/XmppSip.h

@@ -128,7 +128,7 @@ private:
     int m_currentPort;
     QString m_currentResource;
 
-    QPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
+    QSharedPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
     Tomahawk::Accounts::Account::ConnectionState m_state;
 
     // sort out

src/libtomahawk-playdarapi/PlaydarApi.h

@@ -34,7 +34,7 @@ public:
      * Creates a Playdar HTTP interface
      * @param ha Address to listen on
      * @param port Port to listen on with HTTP
-     * @param sport Pot to listen on with HTTPS
+     * @param sport Port to listen on with HTTPS
      * @param parent
      */
     explicit PlaydarApi( QHostAddress ha, qint16 port, qint16 sport, QObject *parent = 0 );

src/libtomahawk/AtticaManager.cpp

@@ -67,7 +67,7 @@ AtticaManager::AtticaManager( QObject* parent )
     connect( &m_manager, SIGNAL( providerAdded( Attica::Provider ) ), this, SLOT( providerAdded( Attica::Provider ) ) );
 
     // resolvers
-//    m_manager.addProviderFile( QUrl( "http://bakery.tomahawk-player.org/resolvers/providers.xml" ) );
+//    m_manager.addProviderFile( QUrl( "http://v09.bakery.tomahawk-player.org/resolvers/providers.xml" ) );
 
     const QString url = QString( "%1/resolvers/providers.xml?version=%2" ).arg( hostname() ).arg( TomahawkUtils::appFriendlyVersion() );
     QNetworkReply* reply = Tomahawk::Utils::nam()->get( QNetworkRequest( QUrl( url ) ) );
@@ -116,7 +116,7 @@ AtticaManager::fetchMissingIcons()
 QString
 AtticaManager::hostname() const
 {
-    return "http://bakery.tomahawk-player.org";
+    return "http://v09.bakery.tomahawk-player.org";
 }
 
 

src/libtomahawk/CMakeLists.txt

@@ -37,6 +37,7 @@ set( libGuiSources
     jobview/ErrorStatusMessage.cpp
     jobview/IndexingJobItem.cpp
     jobview/InboxJobItem.cpp
+    jobview/ScriptErrorStatusMessage.cpp
 
     playlist/InboxModel.cpp
     playlist/InboxView.cpp

src/libtomahawk/DropJob.cpp

@@ -263,9 +263,14 @@ bool
 DropJob::validateLocalFiles(const QString &paths, const QString &suffix)
 {
     QStringList filePaths = paths.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    for ( QStringList::iterator it = filePaths.begin(); it != filePaths.end(); ++it )
+    QStringList::iterator it = filePaths.begin();
+    while ( it != filePaths.end() )
+    {
         if ( !validateLocalFile( *it, suffix ) )
-            filePaths.erase( it );
+            it = filePaths.erase( it );
+        else
+            ++it;
+    }
     return !filePaths.isEmpty();
 }
 

src/libtomahawk/Pipeline.cpp

@@ -595,8 +595,8 @@ Pipeline::shunt( const query_ptr& q )
         // we get here if we disable a resolver while a query is resolving
         // OR we are just out of resolvers while query is still resolving
 
-        //since we seem to at least tried to kick off all of the resolvers,
-        //remove the '.keep' entry
+        // since we seem to at least tried to kick off all of the resolvers,
+        // remove the '.keep' entry
         decQIDState( q, nullptr );
         return;
     }

src/libtomahawk/Query.cpp

@@ -403,12 +403,17 @@ Query::resultSorter( const result_ptr& left, const result_ptr& right )
         {
             return false;
         }
-        if ( !right->isPreview() )
+        if ( left->isPreview() != right->isPreview() )
         {
-            return false;
+            return !left->isPreview();
         }
 
-        return true;
+        if ( left->resolvedBy() != nullptr && right->resolvedBy() != nullptr )
+        {
+            return left->resolvedBy()->weight() > right->resolvedBy()->weight();
+        }
+
+        return left->id() > right->id();
     }
 
     if ( left->isPreview() != right->isPreview() )
@@ -636,6 +641,11 @@ Query::howSimilar( const Tomahawk::result_ptr& r )
         qTrackname  = queryTrack()->trackSortname();
     }
 
+    //Cleanup symbols for minor naming differences
+    qArtistname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
+    qTrackname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
+    qAlbumname.remove(QRegExp(QString::fromUtf8("[-`~!@#$%^&*()_—+=|:;<>«»,.?/{}\'\"\\[\\]\\\\]")));
+
     // normal edit distance
     const int artdist = TomahawkUtils::levenshtein( qArtistname, rArtistname );
     const int trkdist = TomahawkUtils::levenshtein( qTrackname, rTrackname );

src/libtomahawk/Result.cpp

@@ -529,12 +529,23 @@ Result::track() const
 }
 
 
+QList< DownloadFormat >
+Result::downloadFormats() const
+{
+    QMutexLocker lock( &s_mutex );
+
+    return m_formats;
+}
+
+
 void
 Result::setDownloadFormats( const QList<DownloadFormat>& formats )
 {
     if ( formats.isEmpty() )
         return;
 
+    QMutexLocker lock( &s_mutex );
+
     m_formats.clear();
     foreach ( const DownloadFormat& format, formats )
     {
@@ -562,7 +573,7 @@ Result::setDownloadFormats( const QList<DownloadFormat>& formats )
 void
 Result::onSettingsChanged()
 {
-    if ( TomahawkSettings::instance()->downloadsPreferredFormat().toLower() != m_formats.first().extension.toLower() )
+    if ( TomahawkSettings::instance()->downloadsPreferredFormat().toLower() != downloadFormats().first().extension.toLower() )
     {
         setDownloadFormats( downloadFormats() );
         emit updated();

src/libtomahawk/Result.h

@@ -131,7 +131,7 @@ public:
 
     track_ptr track() const;
 
-    QList<DownloadFormat> downloadFormats() const { return m_formats; }
+    QList< DownloadFormat > downloadFormats() const;
     void setDownloadFormats( const QList<DownloadFormat>& formats );
 
     downloadjob_ptr downloadJob() const { return m_downloadJob; }

src/libtomahawk/Typedefs.h

@@ -253,7 +253,7 @@ namespace Tomahawk
         typedef QHash< QString, QString > InfoStringHash;
         typedef QPair< QVariantMap, QVariant > PushInfoPair;
 
-        typedef QPointer< InfoPlugin > InfoPluginPtr;
+        typedef QSharedPointer< InfoPlugin > InfoPluginPtr;
     }
 
     namespace Network

src/libtomahawk/accounts/ResolverAccount.cpp

@@ -517,7 +517,8 @@ ResolverAccount::removeBundle()
 }
 
 
-void ResolverAccount::testConfig()
+void
+ResolverAccount::testConfig()
 {
     // HACK: move to JSAccount once we have that properly
     JSResolver* resolver = qobject_cast< Tomahawk::JSResolver* >( m_resolver );
@@ -535,6 +536,13 @@ void ResolverAccount::testConfig()
 }
 
 
+ExternalResolverGui*
+ResolverAccount::resolver() const
+{
+    return m_resolver;
+}
+
+
 void
 ResolverAccount::onTestConfig( const QVariantMap& result )
 {

src/libtomahawk/accounts/ResolverAccount.h

@@ -101,6 +101,8 @@ public:
 
     void testConfig() override;
 
+    ExternalResolverGui* resolver() const;
+
 private slots:
     void resolverChanged();
     void onTestConfig( const QVariantMap& result );

src/libtomahawk/accounts/lastfm/LastFmAccount.cpp

@@ -71,7 +71,7 @@ LastFmAccount::LastFmAccount( const QString& accountId )
 
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 }
@@ -82,7 +82,6 @@ LastFmAccount::~LastFmAccount()
     if ( m_infoPlugin )
     {
         Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
-        delete m_infoPlugin;
     }
 
     delete m_resolver.data();
@@ -168,9 +167,11 @@ InfoPluginPtr
 LastFmAccount::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
-        m_infoPlugin = QPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) );
+    {
+        m_infoPlugin = QSharedPointer< LastFmInfoPlugin>( new LastFmInfoPlugin( this ) );
+    }
 
-    return InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 bool

src/libtomahawk/accounts/lastfm/LastFmAccount.h

@@ -105,7 +105,7 @@ private:
     void hookupResolver();
 
     QPointer<Tomahawk::ExternalResolverGui> m_resolver;
-    QPointer<Tomahawk::InfoSystem::LastFmInfoPlugin> m_infoPlugin;
+    QSharedPointer<Tomahawk::InfoSystem::LastFmInfoPlugin> m_infoPlugin;
     QPointer<LastFmConfig> m_configWidget;
 };
 

src/libtomahawk/accounts/spotify/SpotifyAccount.cpp

@@ -116,6 +116,12 @@ SpotifyAccount::~SpotifyAccount()
 {
     clearUser();
 
+    if ( m_infoPlugin )
+    {
+        Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
+    }
+
+
     if ( m_spotifyResolver.isNull() )
         return;
 
@@ -135,7 +141,7 @@ SpotifyAccount::init()
 
     if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
     {
-        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        infoPlugin()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
         Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
     }
 
@@ -366,10 +372,10 @@ SpotifyAccount::infoPlugin()
 {
     if ( m_infoPlugin.isNull() )
     {
-        m_infoPlugin = QPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) );
+        m_infoPlugin = QSharedPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) );
     }
 
-    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+    return m_infoPlugin;
 }
 
 

src/libtomahawk/accounts/spotify/SpotifyAccount.h

@@ -170,7 +170,7 @@ private:
     QPointer<SpotifyAccountConfig> m_configWidget;
     QPointer<QWidget> m_aboutWidget;
     QPointer<ScriptResolver> m_spotifyResolver;
-    QPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
+    QSharedPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
 
     QMap<QString, QPair<QObject*, QString> > m_qidToSlotMap;
     QMap<QString, QVariant > m_qidToExtraData;

src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp

@@ -277,7 +277,7 @@ SpotifyAccountConfig::showLoggedIn()
         m_ui->verticalLayout->insertWidget( 1, m_loggedInUser, 0, Qt::AlignCenter );
     }
 
-    qDebug() << "Showing logged in withuserame:" << m_verifiedUsername;
+    qDebug() << "Showing logged in with username:" << m_verifiedUsername;
     m_loggedInUser->show();
     m_loggedInUser->setText( tr( "Logged in as %1" ).arg( m_verifiedUsername ) );
 

src/libtomahawk/audio/AudioEngine.cpp

@@ -669,7 +669,7 @@ AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url )
 
 
 void
-AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io )
+AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io )
 {
     if ( QThread::currentThread() != thread() )
     {

src/libtomahawk/audio/AudioEngine.h

@@ -186,7 +186,7 @@ private slots:
 
 
     void performLoadIODevice( const Tomahawk::result_ptr& result, const QString& url ); //only call from loadTrack kthxbi
-    void performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi
+    void performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi
     void loadPreviousTrack();
     void loadNextTrack();
 

src/libtomahawk/infosystem/InfoSystem.cpp

@@ -277,8 +277,8 @@ InfoSystem::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
 
     if ( plugin.data()->thread() != m_infoSystemWorkerThreadController->worker()->thread() )
     {
+        tLog() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread(): " << plugin->friendlyName();
         Q_ASSERT( false );
-        tDebug() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread()";
         return;
     }
 

src/libtomahawk/infosystem/InfoSystemWorker.cpp

@@ -58,13 +58,7 @@ InfoSystemWorker::InfoSystemWorker()
 
 InfoSystemWorker::~InfoSystemWorker()
 {
-    tDebug() << Q_FUNC_INFO << " beginning";
-    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
-    {
-        if( plugin )
-            delete plugin.data();
-    }
-    tDebug() << Q_FUNC_INFO << " finished";
+    tDebug() << Q_FUNC_INFO;
 }
 
 
@@ -136,29 +130,6 @@ InfoSystemWorker::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
 
     emit updatedSupportedGetTypes( QSet< InfoType >::fromList( m_infoGetMap.keys() ) );
     emit updatedSupportedPushTypes( QSet< InfoType >::fromList( m_infoPushMap.keys() ) );
-
-    connect( plugin.data(), SIGNAL( destroyed( QObject* ) ), SLOT( onInfoPluginDeleted() ) );
-}
-
-
-void
-InfoSystemWorker::onInfoPluginDeleted()
-{
-    foreach( const InfoPluginPtr& plugin, m_plugins )
-    {
-        if ( plugin.isNull() )
-        {
-            m_plugins.removeOne( plugin );
-            foreach( InfoType type, m_infoGetMap.keys() )
-            {
-                m_infoGetMap[type].removeOne( plugin );
-            }
-            foreach( InfoType type, m_infoPushMap.keys() )
-            {
-                m_infoPushMap[type].removeOne( plugin );
-            }
-        }
-    }
 }
 
 

src/libtomahawk/infosystem/InfoSystemWorker.h

@@ -72,7 +72,6 @@ public slots:
 
 private slots:
     void checkTimeoutsTimerFired();
-    void onInfoPluginDeleted();
 
 private:
     void registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType > &getTypes, const QSet< InfoType > &pushTypes );

src/libtomahawk/jobview/JobStatusItem.cpp

@@ -33,6 +33,12 @@ JobStatusItem::~JobStatusItem()
 }
 
 
+void
+JobStatusItem::activated()
+{
+}
+
+
 bool
 JobStatusItem::allowMultiLine() const
 {

src/libtomahawk/jobview/JobStatusItem.h

@@ -53,6 +53,8 @@ public:
     virtual QString mainText() const = 0;
     virtual QString rightColumnText() const { return QString(); };
 
+    virtual void activated();
+
     /**
      * If collapse item is true, sending multiple items of the same type will "collapse" them into one
      * instead of showing each individually. In this case, the right column from the item will be ignored

src/libtomahawk/jobview/JobStatusView.cpp

@@ -118,6 +118,7 @@ JobStatusView::setModel( JobStatusSortModel* m )
     connect( m_view->model(), SIGNAL( customDelegateJobInserted( int, JobStatusItem* ) ), this, SLOT( customDelegateJobInserted( int, JobStatusItem* ) ) );
     connect( m_view->model(), SIGNAL( customDelegateJobRemoved( int ) ), this, SLOT( customDelegateJobRemoved( int ) ) );
     connect( m_view->model(), SIGNAL( refreshDelegates() ), this, SLOT( refreshDelegates() ) );
+    connect( m_view, SIGNAL( activated( QModelIndex ) ), this, SLOT( onItemActivated( QModelIndex ) ) );
 
     foreach ( const QPointer<JobStatusItem> item, s_jobItems )
     {
@@ -184,6 +185,21 @@ JobStatusView::refreshDelegates()
 }
 
 
+void
+JobStatusView::onItemActivated( const QModelIndex& index )
+{
+    QVariant itemVar = index.data( JobStatusModel::JobDataRole );
+    if ( !itemVar.canConvert< JobStatusItem* >() || !itemVar.value< JobStatusItem* >() )
+    {
+        tLog() << Q_FUNC_INFO << "unable to fetch JobStatusItem*";
+        return;
+    }
+
+    JobStatusItem* item = itemVar.value< JobStatusItem* >();
+    item->activated();
+}
+
+
 void
 JobStatusView::checkCount()
 {

src/libtomahawk/jobview/JobStatusView.h

@@ -59,6 +59,7 @@ private slots:
     void customDelegateJobInserted( int row, JobStatusItem* item );
     void customDelegateJobRemoved( int row );
     void refreshDelegates();
+    void onItemActivated( const QModelIndex& index );
 
 private:
     QListView* m_view;

src/libtomahawk/jobview/ScriptErrorStatusMessage.cpp

@@ -0,0 +1,37 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2016, Dominik Schmidt <domme@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptErrorStatusMessage.h"
+#include "../utils/Logger.h"
+
+ScriptErrorStatusMessage::ScriptErrorStatusMessage( const QString& message, Tomahawk::ScriptAccount* account )
+  : ErrorStatusMessage( tr( "Script Error: %1" ).arg( message ) )
+  , m_account( account )
+{
+}
+
+void
+ScriptErrorStatusMessage::activated()
+{
+    if ( m_account.isNull() )
+        return;
+
+    tDebug() << "ScriptErrorStatusMessage clicked: " << mainText() << m_account->name();
+    m_account->showDebugger();
+}
+

src/libtomahawk/jobview/ScriptErrorStatusMessage.h

@@ -0,0 +1,39 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2016, Dominik Schmidt <domme@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SCRIPTERRORSTATUSMESSAGE_H
+#define SCRIPTERRORSTATUSMESSAGE_H
+
+#include "ErrorStatusMessage.h"
+#include "../resolvers/ScriptAccount.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT ScriptErrorStatusMessage : public ErrorStatusMessage
+{
+    Q_OBJECT
+public:
+    explicit ScriptErrorStatusMessage( const QString& scriptErrorMessage, Tomahawk::ScriptAccount* );
+
+    void activated() override;
+
+private:
+    QPointer< Tomahawk::ScriptAccount > m_account;
+};
+
+#endif // SCRIPTERRORSTATUSMESSAGE_H

src/libtomahawk/resolvers/JSAccount.cpp

@@ -67,6 +67,14 @@ JSAccount::scriptPluginFactory( const QString& type, const scriptobject_ptr& obj
 }
 
 
+void
+JSAccount::showDebugger()
+{
+    tLog() << Q_FUNC_INFO << name() << "Show debugger";
+    m_engine->showWebInspector();
+}
+
+
 QString
 JSAccount::serializeQVariantMap( const QVariantMap& map )
 {

src/libtomahawk/resolvers/JSAccount.h

@@ -69,6 +69,8 @@ public:
     void setResolver( JSResolver* resolver );
     void scriptPluginFactory( const QString& type, const scriptobject_ptr& object ) override;
 
+    void showDebugger() override;
+
     static QString serializeQVariantMap(const QVariantMap& map);
 
     void reportNativeScriptJobResult( int resultId, const QVariantMap& result ) override;

src/libtomahawk/resolvers/JSResolver.cpp

@@ -541,7 +541,6 @@ void
 JSResolver::resolve( const Tomahawk::query_ptr& query )
 {
     ScriptJob* job = scriptAccount()->resolve( scriptObject(), query, "resolver" );
-
     connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) );
 
     job->start();
@@ -563,15 +562,24 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
     }
     else
     {
+        if ( !data.value( "artists" ).isNull() )
+        {
+            QList< artist_ptr > artists = scriptAccount()->parseArtistVariantList( data.value( "artists" ).toList() );
+            Tomahawk::Pipeline::instance()->reportArtists( qid, artists );
+        }
+
+        if ( !data.value( "albums" ).isNull() )
+        {
+            QList< album_ptr > albums = scriptAccount()->parseAlbumVariantList( data.value( "albums" ).toList() );
+            Tomahawk::Pipeline::instance()->reportAlbums( qid, albums );
+        }
 
         QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "tracks" ).toList() );
-
         foreach( const result_ptr& result, results )
         {
             result->setResolvedByResolver( this );
             result->setFriendlySource( name() );
         }
-
         Tomahawk::Pipeline::instance()->reportResults( qid, this, results );
     }
 

src/libtomahawk/resolvers/ScriptAccount.cpp

@@ -32,6 +32,8 @@
 #include "ScriptInfoPlugin.h"
 
 // TODO:
+#include "../Artist.h"
+#include "../Album.h"
 #include "../Result.h"
 #include "../Track.h"
 #include <QTime>
@@ -201,6 +203,10 @@ ScriptAccount::unregisterScriptPlugin( const QString& type, const QString& objec
     {
         m_infoPluginFactory->unregisterPlugin( object );
     }
+    else if( type == "linkParser" )
+    {
+        // TODO
+    }
     else
     {
         tLog() << "This plugin type is not handled by Tomahawk or simply cannot be removed yet";
@@ -231,6 +237,10 @@ ScriptAccount::scriptPluginFactory( const QString& type, const scriptobject_ptr&
         ScriptLinkGeneratorPlugin* lgp = new ScriptLinkGeneratorPlugin( object );
         Utils::LinkGenerator::instance()->addPlugin( lgp );
     }
+    else if( type == "linkParser" )
+    {
+        tLog() << "Plugin registered linkParser, which is not implemented yet. UrlLookup won't work";
+    }
     else if ( type == "infoPlugin" )
     {
         m_infoPluginFactory->registerPlugin( object, this );
@@ -247,6 +257,12 @@ ScriptAccount::scriptPluginFactory( const QString& type, const scriptobject_ptr&
 }
 
 
+void
+ScriptAccount::showDebugger()
+{
+}
+
+
 void
 ScriptAccount::onJobDeleted( const QString& jobId )
 {
@@ -254,15 +270,67 @@ ScriptAccount::onJobDeleted( const QString& jobId )
 }
 
 
+QList< Tomahawk::artist_ptr >
+ScriptAccount::parseArtistVariantList( const QVariantList& artistList )
+{
+    QList< Tomahawk::artist_ptr > artists;
+
+    QString artist;
+    foreach( const QVariant& a, artistList )
+    {
+        artist = a.toString().trimmed();
+        if ( artist.isEmpty() )
+            continue;
+
+        artists << Tomahawk::Artist::get( artist );
+    }
+
+    return artists;
+}
+
+
+QList< Tomahawk::album_ptr >
+ScriptAccount::parseAlbumVariantList( const QVariantList& albumList )
+{
+    QList< Tomahawk::album_ptr > albums;
+
+    QString artistString;
+    QString albumString;
+    foreach( const QVariant& av, albumList )
+    {
+        QVariantMap m = av.toMap();
+
+        artistString = m.value( "artist" ).toString().trimmed();
+        albumString = m.value( "album" ).toString().trimmed();
+        if ( artistString.isEmpty() || albumString.isEmpty() )
+            continue;
+
+        albums << Tomahawk::Album::get( Tomahawk::Artist::get( artistString ), albumString );
+    }
+
+    return albums;
+}
+
+
 QList< Tomahawk::result_ptr >
 ScriptAccount::parseResultVariantList( const QVariantList& reslist )
 {
     QList< Tomahawk::result_ptr > results;
 
+
     foreach( const QVariant& rv, reslist )
     {
         QVariantMap m = rv.toMap();
 
+        const QString artistString = m.value("artist").toString().trimmed();
+        const QString trackString = m.value("track").toString().trimmed();
+
+        if ( artistString.isEmpty() || trackString.isEmpty() )
+        {
+            tLog() << Q_FUNC_INFO << "Could not parse Track" << m;
+            continue;
+        }
+
         int duration = m.value( "duration", 0 ).toInt();
         if ( duration <= 0 && m.contains( "durationString" ) )
         {
@@ -270,8 +338,8 @@ ScriptAccount::parseResultVariantList( const QVariantList& reslist )
             duration = time.secsTo( QTime( 0, 0 ) ) * -1;
         }
 
-        Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(),
-                                                          m.value( "track" ).toString(),
+        Tomahawk::track_ptr track = Tomahawk::Track::get( artistString,
+                                                          trackString,
                                                           m.value( "album" ).toString(),
                                                           m.value( "albumArtist" ).toString(),
                                                           duration,

src/libtomahawk/resolvers/ScriptAccount.h

@@ -76,7 +76,11 @@ public:
 
     virtual void scriptPluginFactory( const QString& type, const scriptobject_ptr& object );
 
+    virtual void showDebugger();
+
     // helpers
+    QList< Tomahawk::artist_ptr > parseArtistVariantList( const QVariantList& artistList );
+    QList< Tomahawk::album_ptr > parseAlbumVariantList( const QVariantList& albumList );
     QList< Tomahawk::result_ptr > parseResultVariantList( const QVariantList& reslist );
     ScriptJob* resolve( const scriptobject_ptr& scriptObject, const query_ptr& query, const QString& resolveType );
 

src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp

@@ -28,6 +28,8 @@
 #include "utils/Logger.h"
 #include "../Result.h"
 
+#include <QtConcurrentRun>
+
 using namespace Tomahawk;
 
 ScriptCommand_AllTracks::ScriptCommand_AllTracks( const Tomahawk::collection_ptr& collection,
@@ -117,20 +119,22 @@ ScriptCommand_AllTracks::onTracksJobDone( const QVariantMap& result )
     QSharedPointer< ScriptCollection > collection = m_collection.objectCast< ScriptCollection >();
     Q_ASSERT( !collection.isNull() );
 
-    QList< Tomahawk::result_ptr > t = collection->scriptAccount()->parseResultVariantList( result[ "tracks" ].toList() );
-
-
-    QList< Tomahawk::query_ptr > queries;
-    foreach ( const Tomahawk::result_ptr& result, t )
+    QtConcurrent::run( [] ( ScriptCommand_AllTracks* t, ScriptJob* job, const QVariantMap& result, const QSharedPointer< ScriptCollection >& collection )
     {
-        result->setResolvedByCollection( m_collection );
-        queries.append( result->toQuery() );
-    }
+        QList< Tomahawk::result_ptr > results = collection->scriptAccount()->parseResultVariantList( result[ "tracks" ].toList() );
 
-    tDebug() << Q_FUNC_INFO << "about to push" << queries.count() << "tracks";
+        QList< Tomahawk::query_ptr > queries;
+        foreach ( const Tomahawk::result_ptr& result, results )
+        {
+            result->setResolvedByCollection( collection );
+            queries.append( result->toQuery() );
+        }
 
-    emit tracks( queries );
-    emit done();
+        tDebug() << Q_FUNC_INFO << "about to push" << queries.count() << "tracks";
 
-    job->deleteLater();
+        emit t->tracks( queries );
+        emit t->done();
+
+        job->deleteLater();
+    }, this, job, result, collection );
 }

src/libtomahawk/resolvers/ScriptEngine.cpp

@@ -21,7 +21,7 @@
 
 #include "ScriptEngine.h"
 
-#include "jobview/ErrorStatusMessage.h"
+#include "jobview/ScriptErrorStatusMessage.h"
 #include "jobview/JobStatusModel.h"
 #include "jobview/JobStatusView.h"
 #include "utils/Logger.h"
@@ -51,13 +51,13 @@ ScriptEngine::ScriptEngine( JSAccount* parent )
     settings()->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true );
     settings()->setOfflineStorageDefaultQuota(100 * 1024 * 1024 /* 100 Mb */);
     settings()->setOfflineWebApplicationCacheQuota(100 * 1024 * 1024 /* 100 Mb */);
+    settings()->setAttribute( QWebSettings::DeveloperExtrasEnabled, true );
 
     // HACK
     QStringList cmdArgs = QCoreApplication::instance()->arguments();
     int position = cmdArgs.indexOf( "--show-inspector" ) + 1;
     if ( position > 0 &&  !cmdArgs.at( position ).isEmpty() && parent->name().contains( cmdArgs.at( position ), Qt::CaseInsensitive ) ) {
-        settings()->setAttribute( QWebSettings::DeveloperExtrasEnabled, true );
-        QMetaObject::invokeMethod( this, "initWebInspector", Qt::QueuedConnection );
+        QMetaObject::invokeMethod( this, "showWebInspector", Qt::QueuedConnection );
     }
 
     // Tomahawk is not a user agent
@@ -74,24 +74,13 @@ ScriptEngine::ScriptEngine( JSAccount* parent )
 }
 
 
-void
-ScriptEngine::initWebInspector()
-{
-    m_webInspector.reset( new QWebInspector() );
-    m_webInspector->setPage( this );
-    m_webInspector->setMinimumWidth( 800 );
-    m_webInspector->setMinimumHeight( 600 );
-    m_webInspector->show();
-}
-
-
 void
 ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID )
 {
     tLog() << "JAVASCRIPT:" << QString( "%1:%2" ).arg( m_scriptPath ).arg( lineNumber ) << message << sourceID;
     #ifdef QT_DEBUG
     QFileInfo scriptPath( m_scriptPath );
-    JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Resolver Error: %1:%2 %3" ).arg( scriptPath.fileName() ).arg( lineNumber ).arg( message ) ) );
+    JobStatusView::instance()->model()->addJob( new ScriptErrorStatusMessage( tr( "%1:%2 %3" ).arg( scriptPath.fileName() ).arg( lineNumber ).arg( message ), m_parent ) );
     #endif
 }
 
@@ -148,6 +137,21 @@ ScriptEngine::setScriptPath( const QString& scriptPath )
 }
 
 
+void
+ScriptEngine::showWebInspector()
+{
+    if ( m_webInspector.isNull() )
+    {
+        m_webInspector.reset( new QWebInspector() );
+        m_webInspector->setPage( this );
+        m_webInspector->setMinimumWidth( 800 );
+        m_webInspector->setMinimumHeight( 600 );
+    }
+
+    m_webInspector->show();
+}
+
+
 bool
 ScriptEngine::shouldInterruptJavaScript()
 {

src/libtomahawk/resolvers/ScriptEngine.h

@@ -49,13 +49,13 @@ public:
 
 public slots:
     bool shouldInterruptJavaScript();
+    void showWebInspector();
 
 protected:
     virtual void javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID );
 
 private slots:
     void sslErrorHandler( QNetworkReply* qnr, const QList<QSslError>& errlist );
-    void initWebInspector();
 
 private:
     JSAccount* m_parent;

src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.cpp

@@ -25,14 +25,14 @@ using namespace Tomahawk;
 void
 ScriptInfoPluginFactory::addPlugin( const QSharedPointer< ScriptInfoPlugin >& infoPlugin ) const
 {
-    Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin.data() );
+    Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin );
 }
 
 
 void
 ScriptInfoPluginFactory::removePlugin( const QSharedPointer< ScriptInfoPlugin >& infoPlugin ) const
 {
-    Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin.data() );
+    Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin );
 }
 
 
@@ -42,10 +42,10 @@ ScriptInfoPluginFactory::createPlugin( const scriptobject_ptr& object, ScriptAcc
     // create infoplugin instance
     ScriptInfoPlugin* scriptInfoPlugin = new ScriptInfoPlugin( object, scriptAccount->name() );
 
-    Tomahawk::InfoSystem::InfoPluginPtr infoPlugin( scriptInfoPlugin );
+    QSharedPointer< ScriptInfoPlugin > infoPlugin( scriptInfoPlugin );
 
     // move it to infosystem thread
     infoPlugin->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
 
-    return QSharedPointer< ScriptInfoPlugin >( scriptInfoPlugin );
+    return infoPlugin;
 }

src/libtomahawk/utils/TomahawkUtils.cpp

@@ -320,11 +320,11 @@ filesizeToString( unsigned int size )
 
     if ( mb )
     {
-        return QString( "%1.%2 Mb" ).arg( mb ).arg( int( ( kb % 1024 ) / 102.4 ) );
+        return QString( "%1.%2 MB" ).arg( mb ).arg( int( ( kb % 1024 ) / 102.4 ) );
     }
     else if ( kb )
     {
-        return QString( "%1 Kb" ).arg( kb );
+        return QString( "%1 KB" ).arg( kb );
     }
     else
         return QString::number( size );

src/libtomahawk/viewpages/SearchViewPage.cpp

@@ -372,13 +372,18 @@ SearchWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums )
 
         int distance = TomahawkUtils::levenshtein( m_search, album->name() );
         int maxlen = qMax( m_search.length(), album->name().length() );
-        float score = (float)( maxlen - distance ) / maxlen;
+        float scoreAlbum = (float)( maxlen - distance ) / maxlen;
 
-        if ( score <= 0.1 )
+        distance = TomahawkUtils::levenshtein( m_search, album->artist()->name() );
+        maxlen = qMax( m_search.length(), album->artist()->name().length() );
+        float scoreArtist = (float)( maxlen - distance ) / maxlen;
+
+        float scoreMax = qMax( scoreAlbum, scoreArtist );
+        if ( scoreMax <= 0.1 )
             continue;
 
-        m_albums.insert( album, score );
-//        tDebug() << Q_FUNC_INFO << "found album:" << album->name() << "score:" << score;
+        m_albums.insert( album, scoreMax );
+//        tDebug() << Q_FUNC_INFO << "found album:" << album->name() << "scoreMax:" << scoreMax;
     }
 
 //    updateAlbums();

src/tomahawk/dialogs/SettingsDialog.cpp

@@ -59,6 +59,8 @@
 #include "jobview/ErrorStatusMessage.h"
 #include "utils/NetworkAccessManager.h"
 #include "utils/NetworkProxyFactory.h"
+#include "resolvers/JSAccount.h"
+#include "resolvers/JSResolver.h"
 
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -68,6 +70,7 @@
 #include <QVBoxLayout>
 #include <QSizeGrip>
 #include <QToolBar>
+#include <QMenu>
 
 using namespace Tomahawk;
 using namespace Accounts;
@@ -87,6 +90,7 @@ SettingsDialog::SettingsDialog(QObject *parent )
     , m_restartRequired( false )
     , m_accountModel( 0 )
     , m_sipSpinner( 0 )
+    , m_contextMenu( 0 )
 {
     m_accountsWidget->setFont( TomahawkUtils::systemFont() );
     m_collectionWidget->setFont( TomahawkUtils::systemFont() );
@@ -144,6 +148,12 @@ SettingsDialog::SettingsDialog(QObject *parent )
     m_accountsWidgetUi->accountsView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
     m_accountsWidgetUi->accountsView->setMouseTracking( true );
 
+    m_contextMenu = new QMenu( m_accountsWidgetUi->accountsView );
+    m_contextMenu->setFont( TomahawkUtils::systemFont() );
+    connect( m_accountsWidgetUi->accountsView, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
+    QAction* showDebuggerAction = m_contextMenu->addAction( tr( "Open Account &Debugger..." ) );
+    connect( showDebuggerAction, SIGNAL( triggered(bool) ), SLOT( onShowDebuggerForSelectedAccount() ) );
+
     connect( accountDelegate, SIGNAL( openConfig( Tomahawk::Accounts::Account* ) ), SLOT( openAccountConfig( Tomahawk::Accounts::Account* ) ) );
     connect( accountDelegate, SIGNAL( openConfig( Tomahawk::Accounts::AccountFactory* ) ), SLOT( openAccountFactoryConfig( Tomahawk::Accounts::AccountFactory* ) ) );
     connect( accountDelegate, SIGNAL( update( QModelIndex ) ), m_accountsWidgetUi->accountsView, SLOT( update( QModelIndex ) ) );
@@ -380,6 +390,34 @@ SettingsDialog::onRejected()
 }
 
 
+void
+SettingsDialog::onCustomContextMenu( const QPoint& point )
+{
+    QModelIndex index = m_accountsWidgetUi->accountsView->indexAt( point );
+    if ( !index.isValid() )
+        return;
+
+    // HACK until there is a proper ScriptAccount
+    ResolverAccount* account = qobject_cast< ResolverAccount* >( m_accountProxy->data( index, AccountModel::AccountData ).value< Tomahawk::Accounts::Account* >() );
+    if ( !account )
+        return;
+    Tomahawk::JSResolver* jsResolver = qobject_cast< Tomahawk::JSResolver* >( account->resolver() );
+    if ( !jsResolver )
+        return;
+
+    m_contextMenu->exec( m_accountsWidgetUi->accountsView->mapToGlobal( point ) );
+}
+
+
+void
+SettingsDialog::onShowDebuggerForSelectedAccount()
+{
+    ResolverAccount* account = m_accountProxy->data( m_accountsWidgetUi->accountsView->currentIndex(), AccountModel::AccountData ).value< ResolverAccount* >();
+    Tomahawk::JSResolver* jsResolver = qobject_cast< Tomahawk::JSResolver* >( account->resolver() );
+    jsResolver->scriptAccount()->showDebugger();
+}
+
+
 void
 SettingsDialog::changeEvent( QEvent *e )
 {

src/tomahawk/dialogs/SettingsDialog.h

@@ -37,6 +37,7 @@ class SipPlugin;
 class ResolversModel;
 class QNetworkReply;
 class QToolbarTabDialog;
+class QMenu;
 
 namespace Ui
 {
@@ -130,6 +131,9 @@ private slots:
     void saveSettings();
     void onRejected();
 
+    void onCustomContextMenu( const QPoint& point );
+    void onShowDebuggerForSelectedAccount();
+
 private:
     Ui_Settings_Accounts* m_accountsWidgetUi;
     QWidget* m_accountsWidget;
@@ -152,6 +156,7 @@ private:
     Tomahawk::Accounts::AccountModelFilterProxy* m_accountProxy;
     QHash<QString, QString> m_downloadsFormats;
     AnimatedSpinner* m_sipSpinner;
+    QMenu* m_contextMenu;
 };
 
 #endif // SETTINGSDIALOG_H