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

Fixed scoring fulltext searches.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-05 01:49:00 +02:00
parent 95a2d26618
commit ec650a634d
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/viewpages/SearchViewPage.cpp
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2012 Leo Franchi <lfranchi@kde.org> * Copyright 2012 Leo Franchi <lfranchi@kde.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
@@ -230,15 +230,11 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
m_albumsModel->startLoading(); m_albumsModel->startLoading();
m_resultsModel->startLoading(); m_resultsModel->startLoading();
m_queries << Tomahawk::Query::get( search, uuid() ); m_query = Tomahawk::Query::get( search, uuid() );
connect( m_query.data(), SIGNAL( artistsAdded( QList<Tomahawk::artist_ptr> ) ), SLOT( onArtistsFound( QList<Tomahawk::artist_ptr> ) ) );
foreach ( const Tomahawk::query_ptr& query, m_queries ) connect( m_query.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr> ) ), SLOT( onAlbumsFound( QList<Tomahawk::album_ptr> ) ) );
{ connect( m_query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ), SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ) );
connect( query.data(), SIGNAL( artistsAdded( QList<Tomahawk::artist_ptr> ) ), SLOT( onArtistsFound( QList<Tomahawk::artist_ptr> ) ) ); connect( m_query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( onQueryFinished() ) );
connect( query.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr> ) ), SLOT( onAlbumsFound( QList<Tomahawk::album_ptr> ) ) );
connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ), SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ) );
connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( onQueryFinished() ) );
}
TomahawkUtils::fixMargins( this ); TomahawkUtils::fixMargins( this );
} }
@@ -335,7 +331,7 @@ SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
while ( queries.count() ) while ( queries.count() )
{ {
query_ptr q = queries.takeFirst(); query_ptr q = queries.takeFirst();
if ( !q->results().count() ) if ( q->results().isEmpty() )
continue; continue;
bool done = false; bool done = false;
@@ -344,7 +340,7 @@ SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
PlayableItem* item = m_resultsModel->itemFromIndex( m_resultsModel->index( i, 0, QModelIndex() ) ); PlayableItem* item = m_resultsModel->itemFromIndex( m_resultsModel->index( i, 0, QModelIndex() ) );
if ( item && item->query() && item->query()->numResults( true ) ) if ( item && item->query() && item->query()->numResults( true ) )
{ {
if ( item->query()->score() < q->score() ) if ( m_query->howSimilar( item->query()->results().first() ) < m_query->howSimilar( q->results().first() ) )
{ {
m_resultsModel->insertQuery( q, i ); m_resultsModel->insertQuery( q, i );
done = true; done = true;

2
src/libtomahawk/viewpages/SearchViewPage.h
View File

@@ -91,7 +91,7 @@ private:
PlayableModel* m_resultsModel; PlayableModel* m_resultsModel;
Tomahawk::playlistinterface_ptr m_plInterface; Tomahawk::playlistinterface_ptr m_plInterface;
QList< Tomahawk::query_ptr > m_queries; Tomahawk::query_ptr m_query;
QMap< Tomahawk::artist_ptr, float > m_artists; QMap< Tomahawk::artist_ptr, float > m_artists;
QMap< Tomahawk::album_ptr, float > m_albums; QMap< Tomahawk::album_ptr, float > m_albums;
QMap< Tomahawk::query_ptr, float > m_results; QMap< Tomahawk::query_ptr, float > m_results;