From a2281dcf580d1211af09ddfd119cba2b572d899e Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sun, 16 Oct 2011 14:44:45 -0400 Subject: [PATCH] Add an optimization to deletefiles --- .../database/databasecommand_deletefiles.cpp | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp index c177e3ee1..22eefe0dd 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.cpp +++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp @@ -119,11 +119,14 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi ) { TomahawkSqlQuery dirquery = dbi->newquery(); - dirquery.prepare( QString( "SELECT url FROM file WHERE source IS NULL" ) ); + dirquery.prepare( QString( "SELECT id, url FROM file WHERE source IS NULL" ) ); dirquery.exec(); while ( dirquery.next() ) - m_files << dirquery.value( 0 ).toString(); + { + m_ids << dirquery.value( 0 ).toString(); + m_files << dirquery.value( 1 ).toString(); + } } } else @@ -145,19 +148,19 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi ) if ( m_deleteAll ) { - delquery.prepare( QString( "DELETE FROM file WHERE source %1" ) - .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) ); - - if( !delquery.exec() ) + if ( !m_ids.isEmpty() ) { - qDebug() << "Failed to delete file:" - << delquery.lastError().databaseText() - << delquery.lastError().driverText() - << delquery.boundValues(); - } + delquery.prepare( QString( "DELETE FROM file WHERE source %1" ) + .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) ); - emit done( m_files, source()->collection() ); - return; + if( !delquery.exec() ) + { + qDebug() << "Failed to delete file:" + << delquery.lastError().databaseText() + << delquery.lastError().driverText() + << delquery.boundValues(); + } + } } else if ( !m_ids.isEmpty() ) {