Merge pull request dokuwiki#4543 from dokuwiki/indexer

Make bin/indexer.php more robust

Author: splitbrain

bin/indexer.php

@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 
+use dokuwiki\Logger;
 use splitbrain\phpcli\CLI;
 use splitbrain\phpcli\Options;
 
@@ -36,7 +37,7 @@ protected function setup(Options $options)
         );
         $options->registerOption(
             'quiet',
-            'don\'t produce any output',
+            'DEPRECATED',
             'q'
         );
     }
@@ -54,6 +55,11 @@ protected function main(Options $options)
         $this->clear = $options->getOpt('clear');
         $this->quiet = $options->getOpt('quiet');
 
+        if ($this->quiet) {
+            Logger::deprecated('Calling bin/indexer.php with -q/--quiet is deprecated. Use --loglevel instead.');
+            $this->setLogLevel('emergency');
+        }
+
         if ($this->clear) $this->clearindex();
 
         $this->update();
@@ -66,9 +72,9 @@ protected function update()
     {
         global $conf;
         $data = [];
-        $this->quietecho("Searching pages... ");
+        $this->notice('Searching pages...');
         search($data, $conf['datadir'], 'search_allpages', ['skipacl' => true]);
-        $this->quietecho(count($data) . " pages found.\n");
+        $this->info(count($data) . ' pages found.');
 
         foreach ($data as $val) {
             $this->index($val['id']);
@@ -82,29 +88,28 @@ protected function update()
      */
     protected function index($id)
     {
-        $this->quietecho("$id... ");
-        idx_addPage($id, !$this->quiet, $this->clear);
-        $this->quietecho("done.\n");
+        $this->notice("$id indexing...");
+        try {
+            if (idx_addPage($id, isset($this->loglevel['info']), $this->clear)) {
+                $this->success("$id indexed.");
+            } else {
+                $this->info("$id index not updated.");
+            }
+        } catch (Throwable $e) {
+            $this->error("$id indexing error: " . $e->getMessage());
+            $this->debug($e->getTraceAsString());
+            return;
+        }
     }
 
     /**
      * Clear all index files
      */
     protected function clearindex()
     {
-        $this->quietecho("Clearing index... ");
+        $this->notice('Clearing index...');
         idx_get_indexer()->clear();
-        $this->quietecho("done.\n");
-    }
-
-    /**
-     * Print message if not supressed
-     *
-     * @param string $msg
-     */
-    protected function quietecho($msg)
-    {
-        if (!$this->quiet) echo $msg;
+        $this->success('Index cleared.');
     }
 }