From d9db5ff8966912ade4accd6b5efef490667f4044 Mon Sep 17 00:00:00 2001
From: iaom <zhangpengfei@kylinos.cn>
Date: Mon, 24 Apr 2023 18:33:30 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=97=B6=E9=87=87=E7=94=A8=E5=A2=9E=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A3=80=E9=AA=8C=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E7=B4=A2=E5=BC=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 031ce8bbd8e5fbd469fb3153fe8f62ff019a0bbe.
---
 libsearch/index/batch-indexer.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/libsearch/index/batch-indexer.cpp b/libsearch/index/batch-indexer.cpp
index 15f7609..60f8d08 100644
--- a/libsearch/index/batch-indexer.cpp
+++ b/libsearch/index/batch-indexer.cpp
@@ -126,7 +126,10 @@ void BatchIndexer::basicIndex()
         }
         filesNeedIndex = m_cache;
         qDebug() <<filesNeedIndex.size() << "files need index.";
-    } else if (m_mode == WorkMode::Update || m_mode == WorkMode::Add) {
+    } else if(m_mode == WorkMode::Add) {
+        filesNeedIndex = m_cache;
+        qDebug() <<filesNeedIndex.size() << "files need index.";
+    } else if (m_mode == WorkMode::Update) {
         QFileInfo info;
         QMap<std::string, std::string> indexTimes = basicDb.getIndexTimes();
         qDebug() << indexTimes.size() << "documents recorded";
@@ -136,15 +139,14 @@ void BatchIndexer::basicIndex()
                 filesNeedIndex.append(path);
             }
         }
-        if(m_mode == WorkMode::Update && !indexTimes.isEmpty()) {
+        if(!indexTimes.isEmpty()) {
             qDebug() << indexTimes.size() << "documents need remove.";
             for(std::string uniqueTerm : indexTimes.keys()) {
                 basicDb.removeDocument(uniqueTerm);
             }
             basicDb.commit();
         }
-
-        qDebug() << filesNeedIndex.size() << "files need index.";
+        qDebug() << filesNeedIndex.size() << "files need update.";
     }
     uint allSize = filesNeedIndex.size();
     Q_EMIT progress(IndexType::Basic, allSize, 0);
@@ -205,6 +207,8 @@ void BatchIndexer::contentIndex()
         if(!contentDb.open()) {
             return;
         }
+    }
+    if(m_mode == WorkMode::Rebuild || m_mode == WorkMode::Add) {
         for(QString path : m_cache) {
             info.setFile(path);
             if(true == suffixMap[info.suffix()] && info.isFile()) {
@@ -213,7 +217,7 @@ void BatchIndexer::contentIndex()
                 }
             }
         }
-    } else if(m_mode == WorkMode::Update || m_mode == WorkMode::Add) {
+    } else if(m_mode == WorkMode::Update) {
         QMap<std::string, std::string> indexTimes = contentDb.getIndexTimes();
         qDebug() << indexTimes.size() << "documents recorded";
         for(QString path : m_cache) {
@@ -230,7 +234,7 @@ void BatchIndexer::contentIndex()
                 }
             }
         }
-        if(m_mode == WorkMode::Update && !indexTimes.isEmpty()) {
+        if(!indexTimes.isEmpty()) {
             qDebug() << indexTimes.size() << "documents need remove";
             for(std::string uniqueTerm : indexTimes.keys()) {
                 contentDb.removeDocument(uniqueTerm);
@@ -239,7 +243,6 @@ void BatchIndexer::contentIndex()
         }
     }
 
-
     uint allSize = filesNeedIndex.size();
     qDebug() << allSize << "files need content index.";
     Q_EMIT progress(IndexType::Contents, allSize, 0);