mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

* Only show tracks without an album tag below the 'Unknown' album node in TreeModel.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-04-14 07:47:57 +02:00
parent 3e05151008
commit 8231127a3b
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/database/databasecommand_allalbums.cpp
View File

@@ -63,7 +63,7 @@ DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
while( query.next() ) while( query.next() )
{ {
unsigned int albumId = query.value( 0 ).toUInt(); unsigned int albumId = query.value( 0 ).toUInt();
QString albumName; QString albumName = query.value( 1 ).toString();
if ( query.value( 0 ).isNull() ) if ( query.value( 0 ).isNull() )
{ {
albumName = tr( "Unknown" ); albumName = tr( "Unknown" );

14
src/libtomahawk/database/databasecommand_alltracks.cpp
View File

@@ -54,10 +54,16 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
if ( !m_collection.isNull() ) if ( !m_collection.isNull() )
sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) ); sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
if ( m_album && m_album->id() == 0 ) QString albumToken;
if ( m_album )
{ {
m_artist = m_album->artist().data(); if ( m_album->id() == 0 )
m_album = 0; {
m_artist = m_album->artist().data();
albumToken = QString( "AND album.id IS NULL" );
}
else
albumToken = QString( "AND album.id = %1" ).arg( m_album->id() );
} }
QString sql = QString( QString sql = QString(
@@ -74,7 +80,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
"%4 %5 %6" "%4 %5 %6"
).arg( sourceToken ) ).arg( sourceToken )
.arg( !m_artist ? QString() : QString( "AND artist.id = %1" ).arg( m_artist->id() ) ) .arg( !m_artist ? QString() : QString( "AND artist.id = %1" ).arg( m_artist->id() ) )
.arg( !m_album ? QString() : QString( "AND album.id = %1" ).arg( m_album->id() ) ) .arg( !m_album ? QString() : albumToken )
.arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( m_orderToken ) : QString() ) .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( m_orderToken ) : QString() )
.arg( m_sortDescending ? "DESC" : QString() ) .arg( m_sortDescending ? "DESC" : QString() )
.arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() ); .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );