mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 15:59:42 +01:00
Code Issues Releases Wiki Activity

Merge pull request #42 from hugolm84/master

Browse Source 
Spotify artist browse now supports limit
This commit is contained in:
Hugo Lindström 2011-10-04 00:39:26 -07:00
commit 625a7b8fda
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/utils/spotifyparser.cpp
View File

@ -43,6 +43,7 @@ SpotifyParser::SpotifyParser( const QStringList& Urls, bool createNewPlaylist, Q
, m_trackMode( true )
, m_createNewPlaylist( createNewPlaylist )
, m_browseJob( 0 )
, m_limit ( 40 )
{
foreach ( const QString& url, Urls )
@ -55,6 +56,7 @@ SpotifyParser::SpotifyParser( const QString& Url, bool createNewPlaylist, QObjec
, m_trackMode( true )
, m_createNewPlaylist( createNewPlaylist )
, m_browseJob( 0 )
, m_limit ( 40 )
{
lookupUrl( Url );
}
@ -100,12 +102,6 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw )
}
QUrl url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1" ).arg( browseUri ) );
tDebug() << "Looking up URL..." << url.toString();
QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
connect( reply, SIGNAL( finished() ), this, SLOT( spotifyBrowseFinished() ) );
DropJob::DropType type;
if ( browseUri.contains( "spotify:user" ) )
@ -117,6 +113,18 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw )
if ( browseUri.contains( "spotify:track" ) )
type = DropJob::Track;
QUrl url;
if( type != DropJob::Artist )
url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1" ).arg( browseUri ) );
else
url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1/%2" ).arg( browseUri )
.arg ( m_limit ) );
tDebug() << "Looking up URL..." << url.toString();
QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
connect( reply, SIGNAL( finished() ), this, SLOT( spotifyBrowseFinished() ) );
m_browseJob = new DropJobNotifier( pixmap(), "Spotify", type, reply );
JobStatusView::instance()->model()->addJob( m_browseJob );

2
src/libtomahawk/utils/spotifyparser.h
View File

@ -74,7 +74,7 @@ private:
void lookupSpotifyBrowse( const QString& playlist );
void checkTrackFinished();
void checkBrowseFinished();
int m_limit;
bool m_single;
bool m_trackMode;
bool m_createNewPlaylist;