From c2285dba8401db3098d5a301336363d27370d7ba Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Mon, 23 Jul 2012 17:46:00 -0400 Subject: [PATCH] Show creator of playlist in infobar if it exists --- src/libtomahawk/playlist/PlaylistModel.cpp | 2 +- src/libtomahawk/utils/SpotifyParser.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp index b324b2f42..f5724aaa4 100644 --- a/src/libtomahawk/playlist/PlaylistModel.cpp +++ b/src/libtomahawk/playlist/PlaylistModel.cpp @@ -80,7 +80,7 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn setReadOnly( !m_playlist->author()->isLocal() ); setTitle( playlist->title() ); setDescription( tr( "A playlist by %1, created %2" ) - .arg( playlist->author()->isLocal() ? tr( "you" ) : playlist->author()->friendlyName() ) + .arg( playlist->creator().isEmpty() ? ( playlist->author()->isLocal() ? tr( "you" ) : playlist->author()->friendlyName() ) : playlist->creator() ) .arg( TomahawkUtils::ageToString( QDateTime::fromTime_t( playlist->createdOn() ), true ) ) ); m_isTemporary = false; diff --git a/src/libtomahawk/utils/SpotifyParser.cpp b/src/libtomahawk/utils/SpotifyParser.cpp index d312934c2..e937f8716 100644 --- a/src/libtomahawk/utils/SpotifyParser.cpp +++ b/src/libtomahawk/utils/SpotifyParser.cpp @@ -105,7 +105,7 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw ) m_browseUri.replace( "/", ":" ); m_browseUri = "spotify:" + m_browseUri; } - + if ( m_browseUri.contains( "playlist" ) && Tomahawk::Accounts::SpotifyAccount::instance() != 0 && Tomahawk::Accounts::SpotifyAccount::instance()->loggedIn() ) @@ -303,7 +303,7 @@ SpotifyParser::spotifyTrackLookupFinished() if ( !q.isNull() ) { q->setResultHint( t.value( "trackuri" ).toString() ); - + m_tracks << q; } } @@ -333,10 +333,10 @@ SpotifyParser::playlistListingResult( const QString& msgType, const QVariantMap& { QVariantMap trackMap = blob.toMap(); const query_ptr q = Query::get( trackMap.value( "artist" ).toString(), trackMap.value( "track" ).toString(), trackMap.value( "album" ).toString(), uuid(), false ); - + if ( q.isNull() ) continue; - + m_tracks << q; } @@ -355,7 +355,6 @@ SpotifyParser::checkBrowseFinished() if ( m_createNewPlaylist && !m_tracks.isEmpty() ) { - m_playlist = Playlist::create( SourceList::instance()->getLocal(), uuid(), m_title,