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

* Filter tree-model based on query, not result.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-07-05 12:41:06 +02:00
parent 9492055fc6
commit 8db8e42ec4
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,18 +190,18 @@ 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->result().isNull() ) if ( m_model->mode() == Tomahawk::DatabaseMode && !item->query().isNull() )
{ {
QList< Tomahawk::result_ptr > rl = m_cache.values( sourceParent ); QList< Tomahawk::query_ptr > rl = m_cache.values( sourceParent );
foreach ( const Tomahawk::result_ptr& cachedResult, rl ) foreach ( const Tomahawk::query_ptr& cachedQuery, rl )
{ {
if ( cachedResult.isNull() ) if ( cachedQuery.isNull() )
continue; continue;
if ( cachedResult->track() == item->result()->track() && if ( cachedQuery->track() == item->query()->track() &&
( cachedResult->albumpos() == item->result()->albumpos() || cachedResult->albumpos() == 0 ) ) ( cachedQuery->albumpos() == item->query()->albumpos() || cachedQuery->albumpos() == 0 ) )
{ {
return ( cachedResult.data() == item->result().data() ); return ( cachedQuery.data() == item->query().data() );
} }
} }
@@ -212,9 +212,14 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) ); PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
if ( ti->name() == item->name() && if ( ti && ti->name() == item->name() )
( ti->result()->albumpos() == item->result()->albumpos() || {
ti->result()->albumpos() == 0 || item->result()->albumpos() == 0 ) ) if ( ti->query()->albumpos() == item->query()->albumpos() || ti->query()->albumpos() == 0 || item->query()->albumpos() == 0 )
{
if ( item->result().isNull() )
return false;
if ( !ti->result().isNull() )
{ {
if ( !item->result()->isOnline() && ti->result()->isOnline() ) if ( !item->result()->isOnline() && ti->result()->isOnline() )
return false; return false;
@@ -227,6 +232,8 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
} }
} }
} }
}
}
bool accepted = false; bool accepted = false;
if ( m_filter.isEmpty() ) if ( m_filter.isEmpty() )
@@ -250,7 +257,7 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
} }
} }
m_cache.insertMulti( sourceParent, item->result() ); m_cache.insertMulti( sourceParent, item->query() );
return true; return true;
} }

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

@@ -65,7 +65,7 @@ private:
void filterFinished(); void filterFinished();
QString textForItem( PlayableItem* item ) const; QString textForItem( PlayableItem* item ) const;
mutable QMap< QPersistentModelIndex, Tomahawk::result_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<int> m_albumsFilter;