mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-22 17:01:51 +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 1d84f6ede6
commit e29dc4a8a6
2 changed files with 25 additions and 18 deletions
src/libtomahawk/playlist
TreeProxyModel.cppTreeProxyModel.h

41
src/libtomahawk/playlist/TreeProxyModel.cpp

@ -182,18 +182,18 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
PlayableItem* item = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
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 );
foreach ( const Tomahawk::result_ptr& cachedResult, rl )
QList< Tomahawk::query_ptr > rl = m_cache.values( sourceParent );
foreach ( const Tomahawk::query_ptr& cachedQuery, rl )
{
if ( cachedResult.isNull() )
if ( cachedQuery.isNull() )
continue;
if ( cachedResult->track() == item->result()->track() &&
( cachedResult->albumpos() == item->result()->albumpos() || cachedResult->albumpos() == 0 ) )
if ( cachedQuery->track() == item->query()->track() &&
( cachedQuery->albumpos() == item->query()->albumpos() || cachedQuery->albumpos() == 0 ) )
{
return ( cachedResult.data() == item->result().data() );
return ( cachedQuery.data() == item->query().data() );
}
}
@ -204,17 +204,24 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
if ( ti->name() == item->name() &&
( ti->result()->albumpos() == item->result()->albumpos() ||
ti->result()->albumpos() == 0 || item->result()->albumpos() == 0 ) )
if ( ti && ti->name() == item->name() )
{
if ( !item->result()->isOnline() && ti->result()->isOnline() )
return false;
if ( ( item->result()->collection().isNull() || !item->result()->collection()->source()->isLocal() ) &&
!ti->result()->collection().isNull() && ti->result()->collection()->source()->isLocal() )
if ( ti->query()->albumpos() == item->query()->albumpos() || ti->query()->albumpos() == 0 || item->query()->albumpos() == 0 )
{
return false;
if ( item->result().isNull() )
return false;
if ( !ti->result().isNull() )
{
if ( !item->result()->isOnline() && ti->result()->isOnline() )
return false;
if ( ( item->result()->collection().isNull() || !item->result()->collection()->source()->isLocal() ) &&
!ti->result()->collection().isNull() && ti->result()->collection()->source()->isLocal() )
{
return false;
}
}
}
}
}
@ -242,7 +249,7 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
}
}
m_cache.insertMulti( sourceParent, item->result() );
m_cache.insertMulti( sourceParent, item->query() );
return true;
}

2
src/libtomahawk/playlist/TreeProxyModel.h

@ -64,7 +64,7 @@ private:
void filterFinished();
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<int> m_albumsFilter;