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

JSResolverHelper: Make use of helper functions

Browse Source
This commit is contained in:
Lorenz Hübschle-Schneider
2014-10-21 14:47:26 +02:00
parent 645f09d514
commit d17f509cea
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/resolvers/JSResolverHelper.cpp
View File

@@ -319,7 +319,7 @@ JSResolverHelper::addUrlResult( const QString& url, const QVariantMap& result )
QString guid = result.value( "guid" ).toString(); QString guid = result.value( "guid" ).toString();
Q_ASSERT( !guid.isEmpty() ); Q_ASSERT( !guid.isEmpty() );
// Append nodeid to guid to make it globally unique. // Append nodeid to guid to make it globally unique.
guid += Tomahawk::Database::instance()->impl()->dbid(); guid += instanceUUID();
// Do we already have this playlist loaded? // Do we already have this playlist loaded?
{ {
@@ -354,7 +354,7 @@ JSResolverHelper::addUrlResult( const QString& url, const QVariantMap& result )
{ {
QString xspfUrl = result.value( "url" ).toString(); QString xspfUrl = result.value( "url" ).toString();
Q_ASSERT( !xspfUrl.isEmpty() ); Q_ASSERT( !xspfUrl.isEmpty() );
QString guid = QString( "xspf-%1-%2" ).arg( xspfUrl.toUtf8().toBase64().constData() ).arg( Tomahawk::Database::instance()->impl()->dbid() ); QString guid = QString( "xspf-%1-%2" ).arg( xspfUrl.toUtf8().toBase64().constData() ).arg( instanceUUID() );
// Do we already have this playlist loaded? // Do we already have this playlist loaded?
{ {
@@ -765,13 +765,13 @@ JSResolverHelper::indexDataFromVariant( const QVariantMap &map, struct Tomahawk:
void void
JSResolverHelper::createFuzzyIndex( const QVariantList& list ) JSResolverHelper::createFuzzyIndex( const QVariantList& list )
{ {
if ( m_resolver->d_func()->fuzzyIndex.isNull() ) if ( hasFuzzyIndex() )
{ {
m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, m_resolver->d_func()->accountId + ".lucene" , true ) ); m_resolver->d_func()->fuzzyIndex->wipeIndex();
} }
else else
{ {
m_resolver->d_func()->fuzzyIndex->wipeIndex(); m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, accountId() + ".lucene" , true ) );
} }
addToFuzzyIndex( list ); addToFuzzyIndex( list );
@@ -781,7 +781,7 @@ JSResolverHelper::createFuzzyIndex( const QVariantList& list )
void void
JSResolverHelper::addToFuzzyIndex( const QVariantList& list ) JSResolverHelper::addToFuzzyIndex( const QVariantList& list )
{ {
if ( m_resolver->d_func()->fuzzyIndex.isNull() ) if ( !hasFuzzyIndex() )
{ {
tLog() << Q_FUNC_INFO << "Cannot add entries to non-existing index."; tLog() << Q_FUNC_INFO << "Cannot add entries to non-existing index.";
return; return;