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

* Filter out duplicate tracks in the Tree Collection.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-07-25 03:07:36 +02:00
parent ff7012a65d
commit 0c5673ca79
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/playlist/treemodel.cpp
View File

@@ -589,10 +589,9 @@ TreeModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QVaria
if ( crows.second > 0 )
emit endInsertRows();
else
emit dataChanged( item->index, item->index.sibling( item->index.row(), columnCount( QModelIndex() ) - 1 ) );
qDebug() << rowCount( parent );
emit dataChanged( item->index.sibling( 0, 0 ), item->index.sibling( item->index.row(), columnCount( QModelIndex() ) - 1 ) );
emit loadingFinished();
}

37
src/libtomahawk/playlist/treeproxymodel.cpp
View File

@@ -75,15 +75,42 @@ TreeProxyModel::setFilter( const QString& pattern )
bool
TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
{
TreeModelItem* pi = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
Q_ASSERT( pi );
if ( !pi->result().isNull() )
{
QList< Tomahawk::result_ptr > rl = m_cache.values( sourceParent );
foreach ( const Tomahawk::result_ptr& result, rl )
{
if ( result->track() == pi->result()->track() )
return ( result.data() == pi->result().data() );
}
for ( int i = 0; i < sourceModel()->rowCount( sourceParent ); i++ )
{
if ( i == sourceRow )
continue;
TreeModelItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
if ( ti->result()->track() == pi->result()->track() )
{
if ( !pi->result()->isOnline() && ti->result()->isOnline() )
return false;
if ( ti->result()->collection()->source()->isLocal() )
return false;
}
}
tDebug() << "Accepting:" << pi->result()->toString() << pi->result()->collection()->source()->id();
m_cache.insertMulti( sourceParent, pi->result() );
}
if ( filterRegExp().isEmpty() )
return true;
TreeModelItem* pi = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
if ( !pi )
return false;
QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
bool found = true;
foreach( const QString& s, sl )
{

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

@@ -84,6 +84,8 @@ protected:
private:
QString textForItem( TreeModelItem* item ) const;
mutable QMap< QPersistentModelIndex, Tomahawk::result_ptr > m_cache;
TreeModel* m_model;
RepeatMode m_repeatMode;
bool m_shuffled;