From e02169523008696006f373b2bd2095b9df118b2a Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 30 Sep 2011 17:09:31 -0400 Subject: [PATCH] Next try :-) --- .../database/databasecommand_deletefiles.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp index 1b3b7e892..27c2099f7 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.cpp +++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp @@ -120,8 +120,21 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi ) } else { - foreach( const QVariant& id, m_ids ) - m_files << QString( "servent://%1\t%2" ).arg( source()->userName() ).arg( id.toString() ); + if ( m_deleteAll ) + { + TomahawkSqlQuery dirquery = dbi->newquery(); + + dirquery.prepare( QString( "SELECT url FROM file WHERE source = %1" ).arg( source()->id() ) ); + + dirquery.exec(); + while ( dirquery.next() ) + m_files << dirquery.value( 0 ).toString(); + } + else + { + foreach( const QVariant& id, m_ids ) + m_files << QString( "servent://%1\t%2" ).arg( source()->userName() ).arg( id.toString() ); + } } if ( m_deleteAll ) @@ -148,10 +161,7 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi ) QString idstring; foreach( const QVariant& id, m_ids ) - { - if ( source()->isLocal() ) idstring.append( '"' + id.toString() + "\", " ); - } idstring.chop( 3 ); //remove the trailing "\", " delquery.bindValue( 0, idstring );