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

Don't abuse score when doing fulltext-resolving.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-04 17:15:31 +02:00
parent e41a1014f9
commit 95a2d26618
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/database/DatabaseCommand_Resolve.cpp
View File

@@ -83,7 +83,7 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
// STEP 1 // STEP 1
QList< QPair<int, float> > tracks = lib->search( m_query ); QList< QPair<int, float> > tracks = lib->search( m_query );
if ( tracks.length() == 0 ) if ( tracks.isEmpty() )
{ {
qDebug() << "No candidates found in first pass, aborting resolve" << m_query->queryTrack()->toString(); qDebug() << "No candidates found in first pass, aborting resolve" << m_query->queryTrack()->toString();
emit results( m_query->id(), res ); emit results( m_query->id(), res );
@@ -202,7 +202,7 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
emit albums( m_query->id(), albumList ); emit albums( m_query->id(), albumList );
} }
if ( trackPairs.length() == 0 ) if ( trackPairs.isEmpty() )
{ {
qDebug() << "No candidates found in first pass, aborting resolve" << m_query->fullTextQuery(); qDebug() << "No candidates found in first pass, aborting resolve" << m_query->fullTextQuery();
emit results( m_query->id(), res ); emit results( m_query->id(), res );
@@ -279,15 +279,6 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
result->setRID( uuid() ); result->setRID( uuid() );
result->setResolvedByCollection( s->dbCollection() ); result->setResolvedByCollection( s->dbCollection() );
for ( int k = 0; k < trackPairs.count(); k++ )
{
if ( trackPairs.at( k ).first == (int)track->trackId() )
{
//FIXME: result->setScore( trackPairs.at( k ).second );
break;
}
}
res << result; res << result;
} }