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

[ticket/14257] Add text_reparser manager

Browse Source 
PHPBB3-14257
This commit is contained in:
Oliver Schramm
2015-10-26 01:39:52 +01:00
parent 33500fd372
commit 25e2b17837
7 changed files with 195 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
phpBB/phpbb/console/command/reparser/reparse.php
View File

@@ -22,11 +22,6 @@ use Symfony\Component\Console\Style\SymfonyStyle;
class reparse extends \phpbb\console\command\command
{
/**
* @var \phpbb\config\db_text
*/
protected $config_text;
/**
* @var InputInterface
*/
@@ -47,6 +42,11 @@ class reparse extends \phpbb\console\command\command
*/
protected $reparse_lock;
/**
* @var \phpbb\textreparser\manager
*/
protected $reparser_manager;
/**
* @var \phpbb\di\service_collection
*/
@@ -65,13 +65,13 @@ class reparse extends \phpbb\console\command\command
* @param \phpbb\config\db_text $config_text
* @param \phpbb\lock\db $reparse_lock
*/
public function __construct(\phpbb\user $user, \phpbb\di\service_collection $reparsers, \phpbb\config\db_text $config_text, \phpbb\lock\db $reparse_lock)
public function __construct(\phpbb\user $user, \phpbb\lock\db $reparse_lock, \phpbb\textreparser\manager $reparser_manager, \phpbb\di\service_collection $reparsers)
{
require_once __DIR__ . '/../../../../includes/functions_content.php';
$this->config_text = $config_text;
$this->reparsers = $reparsers;
$this->reparse_lock = $reparse_lock;
$this->reparser_manager = $reparser_manager;
$this->reparsers = $reparsers;
parent::__construct($user);
}
@@ -177,8 +177,6 @@ class reparse extends \phpbb\console\command\command
throw new runtime_exception('REPARSE_LOCK_ERROR', array(), null, 1);
}
$this->load_resume_data();
$name = $input->getArgument('reparser-name');
if (isset($name))
{
@@ -233,15 +231,6 @@ class reparse extends \phpbb\console\command\command
return $value;
}
/**
* Load the resume data from the database
*/
protected function load_resume_data()
{
$resume_data = $this->config_text->get('reparser_resume');
$this->resume_data = (empty($resume_data)) ? array() : unserialize($resume_data);
}
/**
* Reparse all text handled by given reparser within given range
*
@@ -250,6 +239,7 @@ class reparse extends \phpbb\console\command\command
protected function reparse($name)
{
$reparser = $this->reparsers[$name];
$this->resume_data = $this->reparser_manager->get_resume_data($name);
if ($this->input->getOption('dry-run'))
{
$reparser->disable_save();
@@ -288,34 +278,10 @@ class reparse extends \phpbb\console\command\command
$current = $start - 1;
$progress->setProgress($max + 1 - $start);
$this->update_resume_data($name, $current);
$this->reparser_manager->update_resume_data($name, $min, $current, $size, !$this->input->getOption('dry-run'));
}
$progress->finish();
$this->io->newLine(2);
}
/**
* Save the resume data to the database
*/
protected function save_resume_data()
{
$this->config_text->set('reparser_resume', serialize($this->resume_data));
}
/**
* Save the resume data to the database
*
* @param string $name Reparser name
* @param string $current Current ID
*/
protected function update_resume_data($name, $current)
{
$this->resume_data[$name] = array(
'range-min' => $this->get_option($name, 'range-min'),
'range-max' => $current,
'range-size' => $this->get_option($name, 'range-size'),
);
$this->save_resume_data();
}
}