Skip intermediate login page with single provider

[bookstack] / app / Console / Commands / RegenerateSearch.php

diff --git a/app/Console/Commands/RegenerateSearch.php b/app/Console/Commands/RegenerateSearch.php
index d27d73edc01dcbf55443f9bbf8f916539d0c5295..20e3fc7983f8bd7ff472758d20f3693841864ec5 100644 (file)
--- a/app/Console/Commands/RegenerateSearch.php
+++ b/app/Console/Commands/RegenerateSearch.php
@@ -2,8 +2,10 @@
 
 namespace BookStack\Console\Commands;
 
 
 namespace BookStack\Console\Commands;
 

-use BookStack\Entities\SearchService;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Tools\SearchIndex;

 use Illuminate\Console\Command;
 use Illuminate\Console\Command;

+use Illuminate\Support\Facades\DB;

 
 class RegenerateSearch extends Command
 {
 
 class RegenerateSearch extends Command
 {


@@ -21,17 +23,18 @@ class RegenerateSearch extends Command
      */
     protected $description = 'Re-index all content for searching';
 
      */
     protected $description = 'Re-index all content for searching';
 

-    protected $searchService;
+    /**
+     * @var SearchIndex
+     */
+    protected $searchIndex;

 
     /**
      * Create a new command instance.
 
     /**
      * Create a new command instance.

-     *
-     * @param \BookStack\Entities\SearchService $searchService

      */
      */

-    public function __construct(SearchService $searchService)
+    public function __construct(SearchIndex $searchIndex)

     {
         parent::__construct();
     {
         parent::__construct();

-        $this->searchService = $searchService;
+        $this->searchIndex = $searchIndex;

     }
 
     /**
     }
 
     /**


@@ -41,14 +44,18 @@ class RegenerateSearch extends Command
      */
     public function handle()
     {
      */
     public function handle()
     {

-        $connection = \DB::getDefaultConnection();
+        $connection = DB::getDefaultConnection();

         if ($this->option('database') !== null) {
         if ($this->option('database') !== null) {

-            \DB::setDefaultConnection($this->option('database'));
-            $this->searchService->setConnection(\DB::connection($this->option('database')));
+            DB::setDefaultConnection($this->option('database'));

         }
 
         }
 

-        $this->searchService->indexAllEntities();
-        \DB::setDefaultConnection($connection);
-        $this->comment('Search index regenerated');
+        $this->searchIndex->indexAllEntities(function (Entity $model, int $processed, int $total): void {
+            $this->info('Indexed ' . class_basename($model) . ' entries (' . $processed . '/' . $total . ')');
+        });
+
+        DB::setDefaultConnection($connection);
+        $this->line('Search index regenerated!');
+
+        return static::SUCCESS;

     }
 }
     }
 }