Remove ex.fm parser

src/libtomahawk/CMakeLists.txt

@@ -111,7 +111,6 @@ set( libGuiSources
     utils/ItunesLoader.cpp
     utils/RdioParser.cpp
     utils/ShortenedLinkParser.cpp
-    utils/ExfmParser.cpp
     utils/TomahawkStyle.cpp
     utils/DropJobNotifier.cpp
     utils/ProxyStyle.cpp

src/libtomahawk/DropJob.cpp

@@ -33,7 +33,6 @@
 #include "utils/RdioParser.h"
 #include "utils/M3uLoader.h"
 #include "utils/ShortenedLinkParser.h"
-#include "utils/ExfmParser.h"
 #include "utils/Logger.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/XspfLoader.h"
@@ -171,9 +170,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
         if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
             return true;
 
-        if( url.contains( "ex.fm" ) && !url.contains( "/song/" ) ) // We treat everything but song as playlist
-            return true;
-
         if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
             return true;
 
@@ -199,9 +195,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
         if ( url.contains( "spotify" ) && url.contains( "track" ) )
             return true;
 
-        if ( url.contains( "ex.fm" ) && url.contains( "/song/" ) )
-            return true;
-
         if ( url.contains( "rdio.com" ) && ( ( ( url.contains( "track" ) && url.contains( "artist" ) && url.contains( "album" ) )
                                                || url.contains( "playlists" )  ) ) )
             return true;
@@ -223,8 +216,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
             return true;
         if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && url.contains( "album" ) && !url.contains( "track" ) )  )
             return true;
-        if ( url.contains( "ex.fm" ) && url.contains( "site" ) && url.contains( "album" ) )
-            return true;
 
         // Check Scriptresolvers
         foreach ( QPointer<ExternalResolver> resolver, Pipeline::instance()->scriptResolvers() )
@@ -307,9 +298,6 @@ DropJob::isDropType( DropJob::DropType desired, const QMimeData* data )
         if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
             return true;
 
-        if( url.contains( "ex.fm" ) && !url.contains( "/song/" ) ) // We treat all but song as playlist
-            return true;
-
         if ( url.contains( "rdio.com" ) && url.contains( "people" ) && url.contains( "playlist" ) )
             return true;
 #ifdef QCA2_FOUND
@@ -690,23 +678,6 @@ DropJob::handleRdioUrls( const QString& urlsRaw )
 }
 
 
-void
-DropJob::handleExfmUrls( const QString& urlsRaw )
-{
-    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    qDebug() << "Got Ex.fm urls!" << urls;
-
-
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    ExfmParser* exfm = new ExfmParser( urls, dropAction() == Create, this );
-    connect( exfm, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-
-    m_queryCount++;
-
-}
-
 void
 DropJob::handleGroovesharkUrls ( const QString& urlsRaw )
 {
@@ -759,8 +730,6 @@ DropJob::handleAllUrls( const QString& urls )
         handleSpotifyUrls( urls );
     else if ( urls.contains( "rdio.com" ) )
         handleRdioUrls( urls );
-    else if( urls.contains( "ex.fm" ) )
-        handleExfmUrls( urls );
 #ifdef QCA2_FOUND
     else if ( urls.contains( "grooveshark.com" ) )
         handleGroovesharkUrls( urls );
@@ -797,15 +766,6 @@ DropJob::handleTrackUrls( const QString& urls )
         connect( spot, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
         m_queryCount++;
     }
-    else if ( urls.contains( "ex.fm" ) )
-    {
-        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-
-        tDebug() << "Got a list of Exfm tracks!" << tracks;
-        ExfmParser* exfm = new ExfmParser( tracks, false, this );
-        connect( exfm, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
     else if ( urls.contains( "rdio.com" ) )
     {
         QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );

src/libtomahawk/DropJob.h

@@ -114,7 +114,6 @@ public:
     void handleM3u( const QString& urls );
     void handleSpotifyUrls( const QString& urls );
     void handleRdioUrls( const QString& urls );
-    void handleExfmUrls( const QString& urls );
     void handleGroovesharkUrls( const QString& urls );
 
     static bool canParseSpotifyPlaylists();

src/libtomahawk/utils/ExfmParser.cpp

@@ -1,304 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2012, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 "ExfmParser.h"
-
-#include <QtNetwork/QNetworkAccessManager>
-
-#include <qjson/parser.h>
-
-#include "Query.h"
-#include "SourceList.h"
-#include "DropJobNotifier.h"
-#include "ViewManager.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "utils/NetworkReply.h"
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
-using namespace Tomahawk;
-
-QPixmap* ExfmParser::s_pixmap = 0;
-
-
-ExfmParser::ExfmParser( const QStringList& Urls, bool createNewPlaylist, QObject* parent )
-    : QObject ( parent )
-    , m_single( false )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_browseJob( 0 )
-    , m_type( DropJob::All )
-
-{
-    foreach ( const QString& url, Urls )
-        lookupUrl( url );
-}
-
-
-ExfmParser::ExfmParser( const QString& Url, bool createNewPlaylist, QObject* parent )
-    : QObject ( parent )
-    , m_single( true )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_browseJob( 0 )
-    , m_type( DropJob::All )
-{
-    lookupUrl( Url );
-}
-
-
-ExfmParser::~ExfmParser()
-{
-}
-
-
-void
-ExfmParser::lookupUrl( const QString& link )
-{
-    const QString apiBase = "http://ex.fm/api/v3";
-    QString url( link );
-    QStringList paths;
-    foreach( const QString& path, QUrl( link ).path().split( "/" ) )
-    {
-        if ( !path.isEmpty() )
-            paths << path;
-    }
-
-    // User request
-    if ( paths.count() == 1 )
-    {
-        m_type = DropJob::Artist;
-        url = QString( apiBase + "/user/%1/trending" ).arg( paths.takeFirst() );
-    }
-    else
-    {
-        if ( url.contains( "/explore/site-of-the-day" ) ) // We treat site as artist
-        {
-            m_type = DropJob::Artist;
-            url.replace( "/explore/site-of-the-day", "/sotd?results=1" );
-        }
-        else if ( url.contains( "/song/" ) )
-        {
-            m_type = DropJob::Track;
-        }
-        else if( ( url.contains( "site") && url.contains( "album" ) ) || url.contains( "mixtape-of-the-month" ) )
-        {
-            m_type = DropJob::Album;
-            if ( url.contains( "album-of-the-week") )
-                url = QString( apiBase + "/%1?%2" ).arg( "aotw" ).arg( "results=1" ); // Only need the first album, eg. this week
-            if ( url.contains( "mixtape-of-the-month" ) )
-                url = QString( apiBase + "/%1?%2" ).arg( "motm" ).arg( "results=1" ); // Only need the first mixtape, eg. this week
-        }
-        else
-        {
-            m_type = DropJob::Playlist;
-            if ( url.contains( "tastemakers" ) )
-                url.replace( "trending", "explore" );
-        }
-        if ( m_type == DropJob::Playlist )
-        {
-            url.replace( "/genre/", "/tag/" );
-            url.replace( "/search/", "/song/search/" ); // We can only search for tracks, even though we want an artist or whatever
-        }
-
-        url.replace( "http://ex.fm", apiBase );
-    }
-
-    tDebug() << "Looking up URL..." << url;
-    NetworkReply* reply = new NetworkReply( TomahawkUtils::nam()->get( QNetworkRequest( QUrl( url ) ) ) );
-
-    if ( m_createNewPlaylist )
-        connect( reply, SIGNAL( finished() ), SLOT( exfmLookupFinished() ) );
-    else
-        connect( reply, SIGNAL( finished() ), SLOT( exfmBrowseFinished() ) );
-
-    m_browseJob = new DropJobNotifier( pixmap(), "Exfm", m_type, reply );
-    JobStatusView::instance()->model()->addJob( m_browseJob );
-
-    m_queries.insert( reply );
-}
-
-
-void
-ExfmParser::parseTrack( const QVariantMap& res )
-{
-    QString title, artist, album;
-    album = res.value( "album", QString() ).toString();
-    title = res.value( "title", QString() ).toString();
-    artist = res.value( "artist", QString() ).toString();
-
-    if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-    {
-        tLog() << "Didn't get an artist and track name from Exfm, not enough to build a query on. Aborting" << title << artist;
-        return;
-    }
-
-    Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
-
-    if ( !q.isNull() )
-    {
-        tLog() << "Setting resulthint to " << res.value( "url" );
-        q->setResultHint( res.value( "url" ).toString() );
-        q->setProperty( "annotation", res.value( "url" ).toString() );
-        m_tracks << q;
-    }
-}
-
-
-void
-ExfmParser::exfmLookupFinished()
-{
-    NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
-    Q_ASSERT( r );
-    m_queries.remove( r );
-    r->deleteLater();
-
-    if ( r->reply()->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r->reply(), &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from Exfm browse item:" << p.errorString() << "On line" << p.errorLine();
-            return;
-        }
-
-        QStringList paths;
-        foreach ( const QString& path, r->reply()->url().path().split( "/" ) )
-        {
-            if ( !path.isEmpty() )
-                paths << path;
-        }
-
-        QString title, artist, desc;
-        QVariantList tracks;
-
-        if ( m_type == DropJob::Album )
-        {
-            QStringList meta = res.value( "site" ).toMap().value( "title" ).toString().split( ", by " );
-            title = meta.takeFirst();
-            artist = meta.takeLast();
-            tracks = res.value( "site" ).toMap().value( "songs" ).toList();
-        }
-        else
-        {
-            // Take endpoint as title
-            title = paths.takeLast();
-            title[0] = title[0].toUpper();
-
-            if ( paths.contains( "trending") )
-                title = "Trending " + title;
-            else if ( paths.contains( "explore" ) )
-                title = "Explore " + title;
-
-            if ( paths.contains( "user" ) )
-            {
-                int index = paths.indexOf( "user");
-                if ( index != -1 && paths.size() > index+1 )
-                    artist = paths.takeAt(paths.indexOf( "user" ) +1 );
-            }else
-                artist = "Ex.fm";
-
-            tracks = res.value( "songs" ).toList();
-        }
-
-        // Make the title
-        title = title + " by " + artist;
-
-        foreach( const QVariant& track, tracks )
-            parseTrack( track.toMap() );
-
-        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       title,
-                                       desc,
-                                       artist,
-                                       false,
-                                       m_tracks );
-
-        connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-        return;
-    }
-}
-
-
-void
-ExfmParser::playlistCreated()
-{
-    ViewManager::instance()->show( m_playlist );
-
-    deleteLater();
-}
-
-
-void
-ExfmParser::exfmBrowseFinished()
-{
-    NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
-    Q_ASSERT( r );
-
-    r->deleteLater();
-
-    if ( r->reply()->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r->reply(), &ok ).toMap();
-
-        if ( !ok )
-        {
-            qDebug() << "Failed to parse ex.fm json";
-            return;
-        }
-
-        if ( m_type != DropJob::Track )
-        {
-            QVariantList tracks;
-            if( m_type == DropJob::Album )
-                tracks = res.value( "site" ).toMap().value( "songs" ).toList();
-            else
-                tracks = res.value( "songs" ).toList();
-
-            foreach( const QVariant& track, tracks )
-                parseTrack( track.toMap() );
-        }
-        else
-            parseTrack( res.value( "song" ).toMap() );
-
-        if ( m_single && !m_tracks.isEmpty() )
-            emit track( m_tracks.first() );
-        else if ( !m_single && !m_tracks.isEmpty() )
-            emit tracks( m_tracks );
-
-        deleteLater();
-    }
-}
-
-
-QPixmap
-ExfmParser::pixmap() const
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/exfm.png" );
-
-    return *s_pixmap;
-}

src/libtomahawk/utils/ExfmParser.h

@@ -1,89 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 Exfm_PARSER_H
-#define Exfm_PARSER_H
-
-#include "DllMacro.h"
-#include "Typedefs.h"
-#include "Query.h"
-#include "DropJob.h"
-#include "jobview/JobStatusItem.h"
-#include <QObject>
-#include <QtCore/QStringList>
-
-/**
- * Small class to parse Exfm links into query_ptrs
- *
- * Connect to the signals to get the results
- */
-
-class NetworkReply;
-
-namespace Tomahawk
-{
-
-class DropJobNotifier;
-
-class DLLEXPORT ExfmParser : public QObject
-{
-    Q_OBJECT
-public:
-    friend class ExfmJobNotifier;
-    explicit ExfmParser( const QString& trackUrl, bool createNewPlaylist = false, QObject* parent = 0 );
-    explicit ExfmParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
-    virtual ~ExfmParser();
-
-    // if true, emits track(), if false, emits tracks().
-    // only matters if you're using the QString constructor and explicityl dont' want
-    // the single track signal
-    void setSingleMode( bool single ) { m_single = single; }
-
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-    void playlist( const Tomahawk::query_ptr& playlist );
-
-private slots:
-    void exfmBrowseFinished();
-    void exfmLookupFinished();
-    void playlistCreated();
-
-private:
-    QPixmap pixmap() const;
-    void lookupUrl( const QString& url );
-    void checkBrowseFinished();
-    void parseTrack( const QVariantMap& res );
-
-    bool m_single;
-    bool m_trackMode;
-    bool m_createNewPlaylist;
-
-    int m_subscribers;
-    QList< query_ptr > m_tracks;
-    QSet< NetworkReply* > m_queries;
-    Tomahawk::playlist_ptr m_playlist;
-    DropJobNotifier* m_browseJob;
-    DropJob::DropType m_type;
-    static QPixmap* s_pixmap;
-};
-
-}
-
-#endif