mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-21 05:11:44 +02:00
Remove SoundCloudParser
This commit is contained in:
Uwe L. Korn
@@ -111,7 +111,6 @@ set( libGuiSources
|
|||||||
utils/ItunesLoader.cpp
|
utils/ItunesLoader.cpp
|
||||||
utils/RdioParser.cpp
|
utils/RdioParser.cpp
|
||||||
utils/ShortenedLinkParser.cpp
|
utils/ShortenedLinkParser.cpp
|
||||||
utils/SoundcloudParser.cpp
|
|
||||||
utils/ExfmParser.cpp
|
utils/ExfmParser.cpp
|
||||||
utils/TomahawkStyle.cpp
|
utils/TomahawkStyle.cpp
|
||||||
utils/DropJobNotifier.cpp
|
utils/DropJobNotifier.cpp
|
||||||
|
|||||||
@@ -1,275 +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 "SoundcloudParser.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/TomahawkUtilsGui.h"
|
|
||||||
#include "utils/Logger.h"
|
|
||||||
|
|
||||||
#include <qjson/parser.h>
|
|
||||||
|
|
||||||
#include <QNetworkAccessManager>
|
|
||||||
|
|
||||||
using namespace Tomahawk;
|
|
||||||
|
|
||||||
|
|
||||||
SoundcloudParser::SoundcloudParser( const QStringList& Urls, bool createNewPlaylist, QObject* parent )
|
|
||||||
: QObject ( parent )
|
|
||||||
, m_single( false )
|
|
||||||
, m_trackMode( true )
|
|
||||||
, m_createNewPlaylist( createNewPlaylist )
|
|
||||||
, m_getLikes( false )
|
|
||||||
, m_browseJob( 0 )
|
|
||||||
, m_type( DropJob::All )
|
|
||||||
{
|
|
||||||
foreach ( const QString& url, Urls )
|
|
||||||
lookupUrl( url );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
SoundcloudParser::SoundcloudParser( const QString& Url, bool createNewPlaylist, QObject* parent )
|
|
||||||
: QObject ( parent )
|
|
||||||
, m_single( true )
|
|
||||||
, m_trackMode( true )
|
|
||||||
, m_createNewPlaylist( createNewPlaylist )
|
|
||||||
, m_getLikes( false )
|
|
||||||
, m_browseJob( 0 )
|
|
||||||
, m_type( DropJob::All )
|
|
||||||
{
|
|
||||||
lookupUrl( Url );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
SoundcloudParser::~SoundcloudParser()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
SoundcloudParser::lookupUrl( const QString& link )
|
|
||||||
{
|
|
||||||
tDebug() << "Looking up URL..." << link;
|
|
||||||
QString url = link;
|
|
||||||
if ( link.contains( "/likes" ) )
|
|
||||||
{
|
|
||||||
qDebug() << Q_FUNC_INFO << "Requesting likes";
|
|
||||||
url.replace( "/likes", "" );
|
|
||||||
m_getLikes = true;
|
|
||||||
}
|
|
||||||
QUrl scLink( QString( "http://api.soundcloud.com/resolve.json?client_id=TiNg2DRYhBnp01DA3zNag&url=" ) + url );
|
|
||||||
|
|
||||||
NetworkReply* reply = new NetworkReply( TomahawkUtils::nam()->get( QNetworkRequest( scLink ) ) );
|
|
||||||
connect( reply, SIGNAL( finished() ), SLOT( soundcloudLookupFinished() ) );
|
|
||||||
|
|
||||||
m_browseJob = new DropJobNotifier( pixmap(), "Soundcloud", DropJob::All, reply );
|
|
||||||
JobStatusView::instance()->model()->addJob( m_browseJob );
|
|
||||||
|
|
||||||
m_queries.insert( reply );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
SoundcloudParser::parseTrack( const QVariantMap& res )
|
|
||||||
{
|
|
||||||
QString title, artist;
|
|
||||||
title = res.value( "title", QString() ).toString();
|
|
||||||
artist = res.value( "user" ).toMap().value( "username", QString() ).toString();
|
|
||||||
bool streamable = res.value( "streamable" ).toBool();
|
|
||||||
|
|
||||||
if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
|
|
||||||
{
|
|
||||||
tLog() << "Didn't get an artist and track name from Soundcloud, not enough to build a query on. Aborting" << title << artist;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !streamable )
|
|
||||||
{
|
|
||||||
JobStatusView::instance()->model()->addJob(
|
|
||||||
new ErrorStatusMessage( tr( "Track '%1' by %2 is not streamable." ).arg( title ).arg( artist ), 5 ) );
|
|
||||||
tLog() << "Track is not streamble, aborting." << res.value( "uri" ).toString();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, QString(), uuid(), m_trackMode );
|
|
||||||
|
|
||||||
if ( !q.isNull() )
|
|
||||||
{
|
|
||||||
QUrl url = QUrl::fromUserInput( res.value( "stream_url" ).toString() );
|
|
||||||
|
|
||||||
TomahawkUtils::urlAddQueryItem( url, "client_id", "TiNg2DRYhBnp01DA3zNag" );
|
|
||||||
|
|
||||||
|
|
||||||
tLog() << "Setting resulthint to " << res.value( "stream_url" ) << url.toString();
|
|
||||||
q->setResultHint( url.toString() );
|
|
||||||
q->setSaveHTTPResultHint( true );
|
|
||||||
m_tracks << q;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
SoundcloudParser::soundcloudLookupFinished()
|
|
||||||
{
|
|
||||||
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 Soundcloud browse item:" << p.errorString() << "On line" << p.errorLine();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( res.value( "kind" ).toString() == "playlist" )
|
|
||||||
m_type = DropJob::Playlist;
|
|
||||||
if( res.value( "kind" ).toString() == "track" )
|
|
||||||
m_type = DropJob::Track;
|
|
||||||
if( res.value( "kind" ).toString() == "user" )
|
|
||||||
{
|
|
||||||
QUrl url;
|
|
||||||
if ( m_getLikes )
|
|
||||||
{
|
|
||||||
url = QUrl( QString( res.value( "uri" ).toString() + "/favorites.json?client_id=TiNg2DRYhBnp01DA3zNag" ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
url = QUrl( QString( res.value( "uri" ).toString() + "/tracks.json?client_id=TiNg2DRYhBnp01DA3zNag" ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkReply* reply = new NetworkReply( TomahawkUtils::nam()->get( QNetworkRequest( QUrl( url ) ) ) );
|
|
||||||
|
|
||||||
if ( m_createNewPlaylist )
|
|
||||||
m_userData = res;
|
|
||||||
|
|
||||||
connect( reply, SIGNAL( finished() ), SLOT( soundcloudArtistLookupFinished() ) );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( m_type == DropJob::Track )
|
|
||||||
{
|
|
||||||
parseTrack( res );
|
|
||||||
}
|
|
||||||
else if ( m_type == DropJob::Playlist )
|
|
||||||
{
|
|
||||||
QString title, user, desc;
|
|
||||||
title = res.value( "title" ).toString();
|
|
||||||
desc = res.value( "description" ).toString();
|
|
||||||
user = res.value( "user" ).toMap().value( "username" ).toString();
|
|
||||||
|
|
||||||
QVariantList tracks = res.value( "tracks" ).toList();
|
|
||||||
|
|
||||||
foreach( const QVariant& track, tracks )
|
|
||||||
parseTrack( track.toMap() );
|
|
||||||
|
|
||||||
if ( m_createNewPlaylist )
|
|
||||||
{
|
|
||||||
m_playlist = Playlist::create( SourceList::instance()->getLocal(),
|
|
||||||
uuid(),
|
|
||||||
title,
|
|
||||||
desc,
|
|
||||||
user,
|
|
||||||
false,
|
|
||||||
m_tracks );
|
|
||||||
|
|
||||||
connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( m_single && !m_tracks.isEmpty() )
|
|
||||||
emit track( m_tracks.first() );
|
|
||||||
else if ( !m_single && !m_tracks.isEmpty() )
|
|
||||||
emit tracks( m_tracks );
|
|
||||||
|
|
||||||
deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
SoundcloudParser::playlistCreated()
|
|
||||||
{
|
|
||||||
ViewManager::instance()->show( m_playlist );
|
|
||||||
|
|
||||||
deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
SoundcloudParser::soundcloudArtistLookupFinished()
|
|
||||||
{
|
|
||||||
NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
|
|
||||||
Q_ASSERT( r );
|
|
||||||
|
|
||||||
r->deleteLater();
|
|
||||||
|
|
||||||
if ( r->reply()->error() == QNetworkReply::NoError )
|
|
||||||
{
|
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
|
||||||
QVariantList res = p.parse( r->reply(), &ok ).toList();
|
|
||||||
|
|
||||||
foreach( const QVariant& track, res )
|
|
||||||
parseTrack( track.toMap() );
|
|
||||||
|
|
||||||
if ( m_createNewPlaylist )
|
|
||||||
{
|
|
||||||
const QString user = m_userData.value( "full_name" ).toString();
|
|
||||||
const QString title = user + "'s " + ( m_getLikes ? "Favorites" : "Tracks" );
|
|
||||||
m_playlist = Playlist::create( SourceList::instance()->getLocal(),
|
|
||||||
uuid(),
|
|
||||||
title,
|
|
||||||
"",
|
|
||||||
user,
|
|
||||||
false,
|
|
||||||
m_tracks );
|
|
||||||
|
|
||||||
connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
|
|
||||||
return;
|
|
||||||
|
|
||||||
}
|
|
||||||
if ( m_single && !m_tracks.isEmpty() )
|
|
||||||
emit track( m_tracks.first() );
|
|
||||||
else if ( !m_single && !m_tracks.isEmpty() )
|
|
||||||
emit tracks( m_tracks );
|
|
||||||
|
|
||||||
deleteLater();
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
QPixmap
|
|
||||||
SoundcloudParser::pixmap() const
|
|
||||||
{
|
|
||||||
return TomahawkUtils::defaultPixmap( TomahawkUtils::SoundcloudIcon );
|
|
||||||
}
|
|
||||||
@@ -1,92 +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 Soundcloud_PARSER_H
|
|
||||||
#define Soundcloud_PARSER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <QtCore/QStringList>
|
|
||||||
|
|
||||||
#include "Typedefs.h"
|
|
||||||
#include "Query.h"
|
|
||||||
#include "DropJob.h"
|
|
||||||
#include "jobview/JobStatusItem.h"
|
|
||||||
|
|
||||||
#include "DllMacro.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Small class to parse Soundcloud links into query_ptrs
|
|
||||||
*
|
|
||||||
* Connect to the signals to get the results
|
|
||||||
*/
|
|
||||||
|
|
||||||
class NetworkReply;
|
|
||||||
|
|
||||||
namespace Tomahawk
|
|
||||||
{
|
|
||||||
|
|
||||||
class DropJobNotifier;
|
|
||||||
|
|
||||||
class DLLEXPORT SoundcloudParser : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
friend class SoundcloudJobNotifier;
|
|
||||||
explicit SoundcloudParser( const QString& trackUrl, bool createNewPlaylist = false, QObject* parent = 0 );
|
|
||||||
explicit SoundcloudParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
|
|
||||||
virtual ~SoundcloudParser();
|
|
||||||
|
|
||||||
// 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 soundcloudArtistLookupFinished();
|
|
||||||
void soundcloudLookupFinished();
|
|
||||||
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;
|
|
||||||
QVariantMap m_userData;
|
|
||||||
bool m_getLikes;
|
|
||||||
QSet< NetworkReply* > m_queries;
|
|
||||||
Tomahawk::playlist_ptr m_playlist;
|
|
||||||
DropJobNotifier* m_browseJob;
|
|
||||||
DropJob::DropType m_type;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Reference in New Issue
Block a user