mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 11:04:01 +02:00
Code Issues Releases Wiki Activity

Fixed album and track filter in TreeProxyModel.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-13 02:13:57 +02:00
parent 8370e4b72f
commit 6a1d0e6666
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/playlist/TreeProxyModel.cpp
View File

@@ -157,13 +157,12 @@ TreeProxyModel::onFilterArtists( const QList<Tomahawk::artist_ptr>& artists )
foreach ( const Tomahawk::artist_ptr& artist, artists ) foreach ( const Tomahawk::artist_ptr& artist, artists )
{ {
QModelIndex idx = m_model->indexFromArtist( artist ); const QModelIndex idx = m_model->indexFromArtist( artist );
if ( m_model->rowCount( idx ) ) if ( m_model->rowCount( idx ) )
{ {
finished = false; finished = false;
Tomahawk::AlbumsRequest* cmd = m_model->collection()->requestAlbums( artist ); Tomahawk::AlbumsRequest* cmd = m_model->collection()->requestAlbums( artist );
cmd->setFilter( m_filter ); cmd->setFilter( m_filter );
connect( dynamic_cast< QObject* >( cmd ), SIGNAL( albums( QList<Tomahawk::album_ptr> ) ), connect( dynamic_cast< QObject* >( cmd ), SIGNAL( albums( QList<Tomahawk::album_ptr> ) ),
@@ -182,7 +181,9 @@ void
TreeProxyModel::onFilterAlbums( const QList<Tomahawk::album_ptr>& albums ) TreeProxyModel::onFilterAlbums( const QList<Tomahawk::album_ptr>& albums )
{ {
foreach ( const Tomahawk::album_ptr& album, albums ) foreach ( const Tomahawk::album_ptr& album, albums )
m_albumsFilter << album->id(); {
m_albumsFilter << album;
}
filterFinished(); filterFinished();
} }
@@ -212,9 +213,10 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
PlayableItem* item = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) ); PlayableItem* item = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
Q_ASSERT( item ); Q_ASSERT( item );
if ( m_model->mode() == Tomahawk::DatabaseMode && !item->query().isNull() ) //FIXME: m_cache lookup is broken
if ( /*m_model->mode() == Tomahawk::DatabaseMode &&*/ !item->query().isNull() )
{ {
QList< Tomahawk::query_ptr > rl = m_cache.values( sourceParent ); /* QList< Tomahawk::query_ptr > rl = m_cache.values( sourceParent );
foreach ( const Tomahawk::query_ptr& cachedQuery, rl ) foreach ( const Tomahawk::query_ptr& cachedQuery, rl )
{ {
if ( cachedQuery.isNull() ) if ( cachedQuery.isNull() )
@@ -225,7 +227,7 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
{ {
return ( cachedQuery.data() == item->query().data() ); return ( cachedQuery.data() == item->query().data() );
} }
} }*/
for ( int i = 0; i < sourceModel()->rowCount( sourceParent ); i++ ) for ( int i = 0; i < sourceModel()->rowCount( sourceParent ); i++ )
{ {
@@ -233,7 +235,6 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
continue; continue;
PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) ); PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
if ( ti && ti->name() == item->name() && !ti->query().isNull() ) if ( ti && ti->name() == item->name() && !ti->query().isNull() )
{ {
if ( ti->query()->track()->albumpos() == item->query()->track()->albumpos() || ti->query()->track()->albumpos() == 0 || item->query()->track()->albumpos() == 0 ) if ( ti->query()->track()->albumpos() == item->query()->track()->albumpos() || ti->query()->track()->albumpos() == 0 || item->query()->track()->albumpos() == 0 )
@@ -263,7 +264,7 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
else if ( !item->artist().isNull() ) else if ( !item->artist().isNull() )
accepted = m_artistsFilter.contains( item->artist() ); accepted = m_artistsFilter.contains( item->artist() );
else if ( !item->album().isNull() ) else if ( !item->album().isNull() )
accepted = m_albumsFilter.contains( item->album()->id() ); accepted = m_albumsFilter.contains( item->album() );
if ( !accepted ) if ( !accepted )
{ {

2
src/libtomahawk/playlist/TreeProxyModel.h
View File

@@ -74,7 +74,7 @@ private:
mutable QMap< QPersistentModelIndex, Tomahawk::query_ptr > m_cache; mutable QMap< QPersistentModelIndex, Tomahawk::query_ptr > m_cache;
QList<Tomahawk::artist_ptr> m_artistsFilter; QList<Tomahawk::artist_ptr> m_artistsFilter;
QList<int> m_albumsFilter; QList<Tomahawk::album_ptr> m_albumsFilter;
Tomahawk::ArtistsRequest* m_artistsFilterCmd; Tomahawk::ArtistsRequest* m_artistsFilterCmd;
QString m_filter; QString m_filter;