mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/12683] Add progress bar to create_index

Browse Source 
PHPBB3-12683
This commit is contained in:
rubencm
2021-03-24 18:50:29 +01:00
committed by Ruben Calvo
parent ce54ee5e6f
commit 0a24704b4f
15 changed files with 151 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
phpBB/phpbb/console/command/searchindex/create.php
View File

@@ -17,6 +17,7 @@ use phpbb\config\config;
use phpbb\console\command\command;
use phpbb\language\language;
use phpbb\log\log;
use phpbb\search\exception\no_search_backend_found_exception;
use phpbb\search\search_backend_factory;
use phpbb\user;
use Symfony\Component\Console\Input\InputArgument;
@@ -70,7 +71,7 @@ class create extends command
->addArgument(
'search-backend',
InputArgument::REQUIRED,
$this->user->lang('CLI_SEARCHINDEX_SEARCH_BACKEND_NAME')
$this->language->lang('CLI_SEARCHINDEX_SEARCH_BACKEND_NAME')
)
;
}
@@ -90,31 +91,47 @@ class create extends command
$io = new SymfonyStyle($input, $output);
$search_backend = $input->getArgument('search-backend');
$search = $this->search_backend_factory->get($search_backend);
$name = $search->get_name();
try
{
$search = $this->search_backend_factory->get($search_backend);
$name = $search->get_name();
}
catch (no_search_backend_found_exception $e)
{
$io->error($this->language->lang('CLI_SEARCHINDEX_BACKEND_NOT_FOUND', $search_backend));
return command::FAILURE;
}
try
{
$counter = 0;
$progress = $this->create_progress_bar(1, $io, $output, true);
$progress->start();
while (($status = $search->create_index($counter)) !== null)
{
$this->config->set('search_indexing_state', implode(',', $this->state), true);
$progress->setMaxSteps($status['max_post_id']);
$progress->setProgress($status['post_counter']);
$progress->setMessage(round($status['rows_per_second'], 2) . ' rows/s');
$io->success($counter);
$io->success(print_r($status, 1));
$progress->advance();
}
$search->tidy();
$progress->finish();
$io->newLine(2);
}
catch (\Exception $e)
{
$io->error($this->user->lang('CLI_SEARCHINDEX_CREATE_FAILURE', $name));
return 1;
$io->error($this->language->lang('CLI_SEARCHINDEX_CREATE_FAILURE', $name));
return command::FAILURE;
}
$this->log->add('admin', ANONYMOUS, '', 'LOG_SEARCH_INDEX_CREATED', false, array($name));
$io->success($this->user->lang('CLI_SEARCHINDEX_CREATE_SUCCESS', $name));
$io->success($this->language->lang('CLI_SEARCHINDEX_CREATE_SUCCESS', $name));
return 0;
return command::SUCCESS;
}
}

39
phpBB/phpbb/console/command/searchindex/delete.php
View File

@@ -17,6 +17,7 @@ use phpbb\config\config;
use phpbb\console\command\command;
use phpbb\language\language;
use phpbb\log\log;
use phpbb\search\exception\no_search_backend_found_exception;
use phpbb\search\search_backend_factory;
use phpbb\user;
use Symfony\Component\Console\Input\InputArgument;
@@ -70,7 +71,7 @@ class delete extends command
->addArgument(
'search-backend',
InputArgument::REQUIRED,
$this->user->lang('CLI_SEARCHINDEX_SEARCH_BACKEND_NAME')
$this->language->lang('CLI_SEARCHINDEX_SEARCH_BACKEND_NAME')
)
;
}
@@ -90,40 +91,32 @@ class delete extends command
$io = new SymfonyStyle($input, $output);
$search_backend = $input->getArgument('search-backend');
$search = $this->search_backend_factory->get($search_backend);
$name = $search->get_name();
try
{
$this->state = explode(',', $this->config['search_indexing_state']);
$this->max_post_id = $this->get_max_post_id();
$search = $this->search_backend_factory->get($search_backend);
$name = $search->get_name();
}
catch (no_search_backend_found_exception $e)
{
$io->error($this->language->lang('CLI_SEARCHINDEX_BACKEND_NOT_FOUND', $search_backend));
return command::FAILURE;
}
try
{
$search->delete_index($this, '');
$search->tidy();
}
catch (\Exception $e)
{
$io->error($this->user->lang('CLI_SEARCHINDEX_DELETE_FAILURE', $name));
return 1;
$io->error($this->language->lang('CLI_SEARCHINDEX_DELETE_FAILURE', $name));
return command::FAILURE;
}
$this->log->add('admin', ANONYMOUS, '', 'LOG_SEARCH_INDEX_REMOVED', false, array($name));
$io->success($this->user->lang('CLI_SEARCHINDEX_DELETE_SUCCESS', $name));
$io->success($this->language->lang('CLI_SEARCHINDEX_DELETE_SUCCESS', $name));
return 0;
}
function save_state($state = false)
{
global $config;
if ($state)
{
$this->state = $state;
}
ksort($this->state);
$config->set('search_indexing_state', implode(',', $this->state), true);
return command::SUCCESS;
}
}