Add user interfaces for triggering an incremental in a running monitor

src/qtgui/rclm_idx.cpp

@@ -30,24 +30,18 @@
 #include "specialindex.h"
 #include "readfile.h"
 #include "snippets_w.h"
+#include "idxstatus.h"
 
 using namespace std;
 
+
+// This is called from periodic100 if we started an indexer, or from
+// the rclmain idxstatus file watcher, every time the file changes.
 void RclMain::updateIdxStatus()
 {
-    ConfSimple cs(theconfig->getIdxStatusFile().c_str(), 1);
-    QString msg = tr("Indexing in progress: ");
     DbIxStatus status;
-    string val;
-    cs.get("phase", val);
-    status.phase = DbIxStatus::Phase(atoi(val.c_str()));
-    cs.get("fn", status.fn);
-    cs.get("docsdone", &status.docsdone);
-    cs.get("filesdone", &status.filesdone);
-    cs.get("fileerrors", &status.fileerrors);
-    cs.get("dbtotdocs", &status.dbtotdocs);
-    cs.get("totfiles", &status.totfiles);
-
+    readIdxStatus(theconfig, status);
+    QString msg = tr("Indexing in progress: ");
     QString phs;
     switch (status.phase) {
     case DbIxStatus::DBIXS_NONE:phs=tr("None");break;
@@ -153,6 +147,7 @@ void RclMain::periodic100()
     } else {
 	Pidfile pidfile(theconfig->getPidfile());
         pid_t pid = pidfile.open();
+        fileBumpIndexingAction->setEnabled(false);
         if (pid == getpid()) {
             // Locked by me
 	    m_indexerState = IXST_NOTRUNNING;
@@ -172,6 +167,13 @@ void RclMain::periodic100()
 	    // Real time or externally started batch indexer running
 	    m_indexerState = IXST_RUNNINGNOTMINE;
 	    fileToggleIndexingAction->setText(tr("Stop &Indexing"));
+            DbIxStatus status;
+            readIdxStatus(theconfig, status);
+            if (status.hasmonitor) {
+                // Real-time indexer running. We can trigger an
+                // incremental pass
+                fileBumpIndexingAction->setEnabled(true);
+            }
 	    fileToggleIndexingAction->setEnabled(true);
 	    fileRebuildIndexAction->setEnabled(false);
             actionSpecial_Indexing->setEnabled(false);
@@ -292,6 +294,20 @@ void RclMain::toggleIndexing()
     }
 }
 
+#ifndef _WIN32
+void RclMain::bumpIndexing()
+{
+    DbIxStatus status;
+    readIdxStatus(theconfig, status);
+    if (status.hasmonitor) {
+        string cmd("touch ");
+        string path = path_cat(theconfig->getConfDir(), "recoll.conf");
+        cmd += path;
+        system(cmd.c_str());
+    }
+}
+#endif
+
 static void delay(int millisecondsWait)
 {
     QEventLoop loop;

src/qtgui/rclmain.ui

@@ -170,6 +170,17 @@
     <cstring>fileToggleIndexingAction</cstring>
    </property>
   </action>
+  <action name="fileBumpIndexingAction">
+   <property name="text">
+    <string>Trigger incremental pass</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>fileBumpIndexingAction</cstring>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+  </action>
   <action name="fileRebuildIndexAction">
    <property name="text">
     <string>&amp;Rebuild index</string>

src/qtgui/rclmain_w.cpp

@@ -282,6 +282,7 @@ void RclMain::init()
     // sc = new QShortcut(quitKeySeq, restable);
     // connect(sc, SIGNAL (activated()), this, SLOT (fileExit()));
 
+
     // A shortcut to get the focus back to the search entry. 
     QKeySequence seq("Ctrl+Shift+s");
     QShortcut *sc = new QShortcut(seq, this);
@@ -306,6 +307,11 @@ void RclMain::init()
 	    this, SLOT(fileExit() ) );
     connect(fileToggleIndexingAction, SIGNAL(triggered()), 
 	    this, SLOT(toggleIndexing()));
+#ifndef _WIN32
+    fileMenu->insertAction(fileRebuildIndexAction, fileBumpIndexingAction);
+    connect(fileBumpIndexingAction, SIGNAL(triggered()), 
+	    this, SLOT(bumpIndexing()));
+#endif
     connect(fileRebuildIndexAction, SIGNAL(triggered()), 
 	    this, SLOT(rebuildIndex()));
     connect(fileEraseDocHistoryAction, SIGNAL(triggered()), 

src/qtgui/rclmain_w.h

@@ -123,6 +123,9 @@ public slots:
     virtual void fileExit();
     virtual void periodic100();
     virtual void toggleIndexing();
+#ifndef _WIN32
+    virtual void bumpIndexing();
+#endif
     virtual void rebuildIndex();
     virtual void specialIndex();
     virtual void startSearch(std::shared_ptr<Rcl::SearchData> sdata,