Fix url lookup by adding LinkParser plugins

Author: dschmidt

src/libtomahawk/CMakeLists.txt

@@ -126,6 +126,8 @@ set( libGuiSources
     utils/LinkGenerator.cpp
     utils/LinkGeneratorPlugin.cpp
     utils/TomaHkLinkGeneratorPlugin.cpp
+    utils/LinkParser.cpp
+    utils/LinkParserPlugin.cpp
 
     viewpages/SearchViewPage.cpp
     viewpages/SourceViewPage.cpp
@@ -350,22 +352,23 @@ list(APPEND libSources
     resolvers/ScriptCommand_AllArtists.cpp
     resolvers/ScriptCommand_AllAlbums.cpp
     resolvers/ScriptCommand_AllTracks.cpp
-    resolvers/ScriptCommand_LookupUrl.cpp
-    resolvers/ScriptCommandQueue.cpp
     resolvers/ScriptPluginFactory.cpp
 
     # ScriptPlugins
     resolvers/ScriptCollection.cpp
     resolvers/plugins/ScriptCollectionFactory.cpp
     resolvers/ScriptInfoPlugin.cpp
     resolvers/plugins/ScriptInfoPluginFactory.cpp
+    resolvers/plugins/ScriptLinkParserPlugin.cpp
+    resolvers/plugins/ScriptLinkParserPluginFactory.cpp
 
 
     sip/SipPlugin.cpp
     sip/SipInfo.cpp
     sip/PeerInfo.cpp
     sip/SipStatusMessage.cpp
 
+    utils/UrlType.cpp
     utils/Cloudstream.cpp
     utils/Json.cpp
     utils/TomahawkUtils.cpp

src/libtomahawk/DropJob.cpp

@@ -35,6 +35,7 @@
 #include "utils/Logger.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/XspfLoader.h"
+#include "utils/LinkParser.h"
 
 #include "Artist.h"
 #include "Album.h"
@@ -172,12 +173,7 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
         if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
             return true;
 
-        // Check Scriptresolvers
-        foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
-        {
-            if ( resolver->canParseUrl( url, ExternalResolver::UrlTypePlaylist ) )
-                return true;
-        }
+        return Tomahawk::Utils::LinkParser::instance()->canParseUrl( url, Tomahawk::Utils::UrlTypePlaylist );
     }
 
     if ( acceptedType.testFlag( Track ) )
@@ -198,12 +194,7 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
                                                || url.contains( "playlists" )  ) ) )
             return true;
 
-        // Check Scriptresolvers
-        foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
-        {
-            if ( resolver->canParseUrl( url, ExternalResolver::UrlTypeTrack ) )
-                return true;
-        }
+        return Tomahawk::Utils::LinkParser::instance()->canParseUrl( url, Tomahawk::Utils::UrlTypeTrack );
     }
 
     if ( acceptedType.testFlag( Album ) )
@@ -215,12 +206,7 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
         if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && url.contains( "album" ) && !url.contains( "track" ) )  )
             return true;
 
-        // Check Scriptresolvers
-        foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
-        {
-            if ( resolver->canParseUrl( url, ExternalResolver::UrlTypeAlbum ) )
-                return true;
-        }
+        return Tomahawk::Utils::LinkParser::instance()->canParseUrl( url, Tomahawk::Utils::UrlTypeAlbum );
     }
 
     if ( acceptedType.testFlag( Artist ) )
@@ -232,12 +218,7 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
         if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && !url.contains( "album" ) && !url.contains( "track" ) )  )
             return true;
 
-        // Check Scriptresolvers
-        foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
-        {
-            if ( resolver->canParseUrl( url, ExternalResolver::UrlTypeArtist ) )
-                return true;
-        }
+        return Tomahawk::Utils::LinkParser::instance()->canParseUrl( url, Tomahawk::Utils::UrlTypeArtist );
     }
 
     // We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them,
@@ -303,15 +284,7 @@ DropJob::isDropType( DropJob::DropType desired, const QMimeData* data )
         if ( ShortenedLinkParser::handlesUrl( url ) )
             return true;
 
-        // Check Scriptresolvers
-        foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
-        {
-            if ( resolver->canParseUrl( url, ExternalResolver::UrlTypePlaylist ) )
-            {
-                tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Accepting current drop as a playlist" << resolver->name();
-                return true;
-            }
-        }
+        return Tomahawk::Utils::LinkParser::instance()->canParseUrl( url, Tomahawk::Utils::UrlTypePlaylist );
 
     }
 
@@ -761,16 +734,12 @@ DropJob::handleTrackUrls( const QString& urls )
 
         foreach ( QString track, tracks )
         {
-            foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
+            QList< QSharedPointer< Utils::LinkParserPlugin > > parserPlugins = Utils::LinkParser::instance()->parserPluginsForUrl( track, Utils::UrlTypeAny );
+            if( !parserPlugins.isEmpty() )
             {
-                if ( resolver->canParseUrl( track, ExternalResolver::UrlTypeAny ) )
-                {
-                    ScriptCommand_LookupUrl* cmd = new ScriptCommand_LookupUrl( resolver, track );
-                    connect( cmd, SIGNAL( information( QString, QSharedPointer<QObject> ) ), this, SLOT( informationForUrl( QString, QSharedPointer<QObject> ) ) );
-                    cmd->enqueue();
-                    m_queryCount++;
-                    break;
-                }
+                Tomahawk::Utils::LinkParser::instance()->lookupUrl( track, parserPlugins );
+                connect( Tomahawk::Utils::LinkParser::instance(), SIGNAL( informationFound( QString, QSharedPointer<QObject> ) ), this, SLOT( informationForUrl( QString, QSharedPointer<QObject> ) ) );
+                m_queryCount++;
             }
         }
     }

src/libtomahawk/GlobalActionManager.cpp

@@ -35,13 +35,13 @@
 #include "playlist/TrackView.h"
 #include "playlist/PlayableModel.h"
 #include "resolvers/ExternalResolver.h"
-#include "resolvers/ScriptCommand_LookupUrl.h"
 #include "utils/JspfLoader.h"
 #include "utils/Logger.h"
 #include "utils/SpotifyParser.h"
 #include "utils/XspfLoader.h"
 #include "utils/XspfGenerator.h"
 #include "viewpages/SearchViewPage.h"
+#include "utils/LinkParser.h"
 
 #include "Pipeline.h"
 #include "TomahawkSettings.h"
@@ -162,27 +162,12 @@ GlobalActionManager::openUrl( const QString& url )
     else if ( url.contains( "open.spotify.com" ) || url.startsWith( "spotify:" ) )
         return openSpotifyLink( url );
 
-    // Can we parse the Url using a ScriptResolver?
-    bool canParse = false;
-    QList< QPointer< ExternalResolver > > possibleResolvers;
-    foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
+    // Can we parse the Url using LinkParser?
+    QList< QSharedPointer< Utils::LinkParserPlugin > > parserPlugins = Utils::LinkParser::instance()->parserPluginsForUrl( url, Utils::UrlTypeAny );
+    if( !parserPlugins.isEmpty() )
     {
-        if ( resolver->canParseUrl( url, ExternalResolver::UrlTypeAny ) )
-        {
-            canParse = true;
-            possibleResolvers << resolver;
-        }
-    }
-    if ( canParse )
-    {
-        m_queuedUrl = url;
-        foreach ( QPointer<ExternalResolver> resolver, possibleResolvers )
-        {
-            ScriptCommand_LookupUrl* cmd = new ScriptCommand_LookupUrl( resolver, url );
-            connect( cmd, SIGNAL( information( QString, QSharedPointer<QObject> ) ), this, SLOT( informationForUrl( QString, QSharedPointer<QObject> ) ) );
-            cmd->enqueue();
-        }
-
+        Tomahawk::Utils::LinkParser::instance()->lookupUrl( url, parserPlugins );
+        connect( Tomahawk::Utils::LinkParser::instance(), SIGNAL( informationFound( QString, QSharedPointer<QObject> ) ), this, SLOT( informationForUrl( QString, QSharedPointer<QObject> ) ), Qt::UniqueConnection );
         return true;
     }
 

src/libtomahawk/resolvers/ExternalResolver.h

@@ -24,8 +24,6 @@
 #include "Source.h"
 #include "DllMacro.h"
 #include "Resolver.h"
-#include "ScriptCommandQueue.h"
-#include "ScriptCommand_LookupUrl.h"
 #include "Typedefs.h"
 
 #include <QObject>
@@ -45,7 +43,6 @@ class DLLEXPORT ExternalResolver : public Resolver
 {
 Q_OBJECT
 
-    friend class ScriptCommandQueue;
     friend class ScriptCommand_LookupUrl;
 
 public:
@@ -61,26 +58,13 @@ Q_OBJECT
         Browsable = 0x1,        // can be represented in one or more collection tree views
         PlaylistSync = 0x2,     // can sync playlists
         AccountFactory = 0x4,   // can configure multiple accounts at the same time
-        UrlLookup = 0x8         // can be queried for information on an Url
     };
     Q_DECLARE_FLAGS( Capabilities, Capability )
     Q_FLAGS( Capabilities )
 
-    enum UrlType
-    {
-        UrlTypeAny =       0x00,
-        UrlTypePlaylist =  0x01,
-        UrlTypeTrack =     0x02,
-        UrlTypeAlbum =     0x04,
-        UrlTypeArtist =    0x08,
-        UrlTypeXspf =      0x10
-    };
-    Q_DECLARE_FLAGS( UrlTypes, UrlType )
-    Q_FLAGS( UrlTypes )
-
     ExternalResolver( const QString& filePath )
-        : m_commandQueue( new ScriptCommandQueue( this ) )
-    { m_filePath = filePath; }
+        : m_filePath( filePath )
+    {}
 
     QString filePath() const { return m_filePath; }
     virtual void setIcon( const QPixmap& ) {}
@@ -92,12 +76,6 @@ Q_OBJECT
     virtual bool running() const = 0;
     virtual Capabilities capabilities() const = 0;
 
-    // UrlLookup, sync call
-    virtual bool canParseUrl( const QString& url, UrlType type ) = 0;
-
-    virtual void enqueue( const QSharedPointer< ScriptCommand >& req )
-    { m_commandQueue->enqueue( req ); }
-
 public slots:
     virtual void start() = 0;
     virtual void stop() = 0;
@@ -112,11 +90,6 @@ public slots:
 
 protected:
     void setFilePath( const QString& path ) { m_filePath = path; }
-    ScriptCommandQueue* m_commandQueue;
-
-    // Should only be called by ScriptCommands
-    // UrlLookup
-    virtual void lookupUrl( const QString& url ) = 0;
 
 private:
     QString m_filePath;