From 0277d1213e613bdac76bf7daea27b4accbc2a218 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Tue, 11 Oct 2011 13:33:55 -0400
Subject: [PATCH] Add some debug and fix a double-delete issue

---
 src/libtomahawk/database/databasecommand_deletefiles.cpp | 1 +
 src/musicscanner.cpp                                     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp
index 8c021dfd9..40a9179d4 100644
--- a/src/libtomahawk/database/databasecommand_deletefiles.cpp
+++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp
@@ -108,6 +108,7 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
             dirquery.bindValue( 0, idstring );
             tDebug() << Q_FUNC_INFO << " binding id string: " << idstring;
             dirquery.exec();
+            tDebug() << Q_FUNC_INFO << " result size: " << dirquery.size();
             while ( dirquery.next() )
             {
                 tDebug() << Q_FUNC_INFO << " found dirquery value 0: " << dirquery.value( 0 ).toString() << " and value 1: " << dirquery.value( 1 ).toString();
diff --git a/src/musicscanner.cpp b/src/musicscanner.cpp
index dc3602927..17b6783f9 100644
--- a/src/musicscanner.cpp
+++ b/src/musicscanner.cpp
@@ -257,9 +257,8 @@ MusicScanner::listerFinished( const QMap<QString, unsigned int>& newmtimes  )
 
     // any remaining stuff that wasnt emitted as a batch:
     foreach( const QString& key, m_filemtimes.keys() )
-    {
         m_filesToDelete << m_filemtimes[ key ].keys().first();
-    }
+
     commitBatch( m_scannedfiles, m_filesToDelete );
     m_scannedfiles.clear();
     m_filesToDelete.clear();
@@ -325,6 +324,7 @@ MusicScanner::commitBatch( const QVariantList& tracks, const QVariantList& delet
 void
 MusicScanner::scanFile( const QFileInfo& fi )
 {
+    tDebug() << Q_FUNC_INFO << " scanning file: " << fi.canonicalFilePath();
     if ( m_mode == TomahawkSettings::Files && m_filemtimes.contains( "file://" + fi.canonicalFilePath() ) )
     {
         if ( fi.lastModified().toUTC().toTime_t() == m_filemtimes.value( "file://" + fi.canonicalFilePath() ).values().first() )
@@ -334,6 +334,7 @@ MusicScanner::scanFile( const QFileInfo& fi )
         }
 
         m_filesToDelete << m_filemtimes.value( "file://" + fi.canonicalFilePath() ).keys().first();
+        m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
     }
 
     QVariant m = readFile( fi );