From 297b23066982aa5310064036b109a6c9e39f5504 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 13 Nov 2011 19:15:37 +0100
Subject: [PATCH] * Force an index update after 0.3.1 upgrade.

---
 .../databasecommand_updatesearchindex.cpp       |  1 +
 src/libtomahawk/tomahawksettings.cpp            | 17 ++++++++++++++++-
 src/libtomahawk/tomahawksettings.h              |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp
index dc5c1fb29..6fe5e18a4 100644
--- a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp
+++ b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp
@@ -26,6 +26,7 @@
 DatabaseCommand_UpdateSearchIndex::DatabaseCommand_UpdateSearchIndex()
     : DatabaseCommand()
 {
+    tLog() << Q_FUNC_INFO << "Updating index.";
 }
 
 
diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index d80ea268e..705f72046 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -31,7 +31,10 @@
 #include "utils/logger.h"
 #include "utils/tomahawkutils.h"
 
-#define VERSION 4
+#include "database/databasecommand_updatesearchindex.h"
+#include "database/database.h"
+
+#define VERSION 5
 
 using namespace Tomahawk;
 
@@ -224,6 +227,10 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
             tDebug() << "UPGRADING AND DELETING:" << resolverDir.absolutePath();
             TomahawkUtils::removeDirectory( resolverDir.absolutePath() );
         }
+    } else if ( oldVersion == 4 )
+    {
+        // 0.3.0 contained a bug which prevent indexing local files. Force a reindex.
+        QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
     }
 }
 
@@ -997,3 +1004,11 @@ TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMod
 {
     setValue( "privatelisteningmode", mode );
 }
+
+
+void
+TomahawkSettings::updateIndex()
+{
+    DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index 9ce0b2a5a..2ae83885e 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -219,6 +219,9 @@ signals:
     void changed();
     void recentlyPlayedPlaylistAdded( const Tomahawk::playlist_ptr& playlist );
 
+private slots:
+    void updateIndex();
+
 private:
     void doInitialSetup();
     void doUpgrade( int oldVersion, int newVersion );