mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

Show creator of playlist in infobar if it exists

Browse Source
This commit is contained in:
Leo Franchi
2012-07-23 17:46:00 -04:00
parent 5441128473
commit c2285dba84
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/playlist/PlaylistModel.cpp
View File

@@ -80,7 +80,7 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn
setReadOnly( !m_playlist->author()->isLocal() ); setReadOnly( !m_playlist->author()->isLocal() );
setTitle( playlist->title() ); setTitle( playlist->title() );
setDescription( tr( "A playlist by %1, created %2" ) 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 ) ) ); .arg( TomahawkUtils::ageToString( QDateTime::fromTime_t( playlist->createdOn() ), true ) ) );
m_isTemporary = false; m_isTemporary = false;

9
src/libtomahawk/utils/SpotifyParser.cpp
View File

@@ -105,7 +105,7 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw )
m_browseUri.replace( "/", ":" ); m_browseUri.replace( "/", ":" );
m_browseUri = "spotify:" + m_browseUri; m_browseUri = "spotify:" + m_browseUri;
} }
if ( m_browseUri.contains( "playlist" ) && if ( m_browseUri.contains( "playlist" ) &&
Tomahawk::Accounts::SpotifyAccount::instance() != 0 && Tomahawk::Accounts::SpotifyAccount::instance() != 0 &&
Tomahawk::Accounts::SpotifyAccount::instance()->loggedIn() ) Tomahawk::Accounts::SpotifyAccount::instance()->loggedIn() )
@@ -303,7 +303,7 @@ SpotifyParser::spotifyTrackLookupFinished()
if ( !q.isNull() ) if ( !q.isNull() )
{ {
q->setResultHint( t.value( "trackuri" ).toString() ); q->setResultHint( t.value( "trackuri" ).toString() );
m_tracks << q; m_tracks << q;
} }
} }
@@ -333,10 +333,10 @@ SpotifyParser::playlistListingResult( const QString& msgType, const QVariantMap&
{ {
QVariantMap trackMap = blob.toMap(); QVariantMap trackMap = blob.toMap();
const query_ptr q = Query::get( trackMap.value( "artist" ).toString(), trackMap.value( "track" ).toString(), trackMap.value( "album" ).toString(), uuid(), false ); const query_ptr q = Query::get( trackMap.value( "artist" ).toString(), trackMap.value( "track" ).toString(), trackMap.value( "album" ).toString(), uuid(), false );
if ( q.isNull() ) if ( q.isNull() )
continue; continue;
m_tracks << q; m_tracks << q;
} }
@@ -355,7 +355,6 @@ SpotifyParser::checkBrowseFinished()
if ( m_createNewPlaylist && !m_tracks.isEmpty() ) if ( m_createNewPlaylist && !m_tracks.isEmpty() )
{ {
m_playlist = Playlist::create( SourceList::instance()->getLocal(), m_playlist = Playlist::create( SourceList::instance()->getLocal(),
uuid(), uuid(),
m_title, m_title,