From f55ff6f13b26fffdc142163d64c53bab9b1cd48a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 19 Oct 2014 10:18:49 +0200 Subject: [PATCH] Emit signal when indexing starts. --- src/libtomahawk/database/Database.cpp | 1 + src/libtomahawk/database/Database.h | 3 ++- src/libtomahawk/database/DatabaseImpl.cpp | 1 + src/libtomahawk/database/DatabaseImpl.h | 2 ++ src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp | 1 + src/libtomahawk/database/fuzzyindex/FuzzyIndex.h | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp index 4d78658aa..ffa9e2d85 100644 --- a/src/libtomahawk/database/Database.cpp +++ b/src/libtomahawk/database/Database.cpp @@ -119,6 +119,7 @@ Database::Database( const QString& dbname, QObject* parent ) tDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentThreads << "database worker threads"; connect( m_impl, SIGNAL( indexReady() ), SLOT( markAsReady() ) ); + connect( m_impl, SIGNAL( indexStarted() ), SIGNAL( indexStarted() ) ); connect( m_impl, SIGNAL( indexReady() ), SIGNAL( indexReady() ) ); Q_ASSERT( m_workerRW ); diff --git a/src/libtomahawk/database/Database.h b/src/libtomahawk/database/Database.h index b5fe64282..a4eced5f0 100644 --- a/src/libtomahawk/database/Database.h +++ b/src/libtomahawk/database/Database.h @@ -101,7 +101,8 @@ public: } signals: - void indexReady(); // search index + void indexStarted(); + void indexReady(); void ready(); void newJobRO( Tomahawk::dbcmd_ptr ); diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 29165e541..588c5692e 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -199,6 +199,7 @@ Tomahawk::DatabaseImpl::dumpDatabase() void Tomahawk::DatabaseImpl::loadIndex() { + connect( m_fuzzyIndex, SIGNAL( indexStarted() ), SIGNAL( indexStarted() ) ); connect( m_fuzzyIndex, SIGNAL( indexReady() ), SIGNAL( indexReady() ) ); m_fuzzyIndex->loadLuceneIndex(); } diff --git a/src/libtomahawk/database/DatabaseImpl.h b/src/libtomahawk/database/DatabaseImpl.h index 2c029998d..4cb7f0f8c 100644 --- a/src/libtomahawk/database/DatabaseImpl.h +++ b/src/libtomahawk/database/DatabaseImpl.h @@ -86,7 +86,9 @@ public: void loadIndex(); signals: + void indexStarted(); void indexReady(); + void schemaUpdateStarted(); void schemaUpdateStatus( const QString& message ); void schemaUpdateDone(); diff --git a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp index d40a7f99d..458fc0157 100644 --- a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp +++ b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp @@ -94,6 +94,7 @@ FuzzyIndex::updateIndexSlot() void FuzzyIndex::beginIndexing() { + emit indexStarted(); m_mutex.lock(); try diff --git a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h index 4780bb882..fad21cd83 100644 --- a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h +++ b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h @@ -52,6 +52,7 @@ public: virtual void updateIndex(); signals: + void indexStarted(); void indexReady(); public slots: