makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12692] Add output

Browse source 
PHPBB3-12692
This commit is contained in:
Tristan Darricau 2014-08-18 15:18:08 +02:00 • committed by Tristan Darricau
parent a55c83b771
commit 24e39545ae
4 changed files with 69 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/language/en/cli.php
View file

@ -96,4 +96,10 @@ $lang = array_merge($lang, array(
'THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.', 'THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.',
'THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.', 'THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.',
'THUMBNAIL_GENERATED' => '%1$s (%2$s) generated.', 'THUMBNAIL_GENERATED' => '%1$s (%2$s) generated.',
'THUMBNAIL_DELETING' => 'Deleting the thumbnails...',
'THUMBNAIL_GENERATING' => 'Generating the thumbnails...',
'NO_THUMBNAIL_TO_GENERATE' => 'No thumbnail to generate.',
'NO_THUMBNAIL_TO_DELETE' => 'No thumbnail to delete.',
)); ));

30
phpBB/phpbb/console/command/thumbnail/delete.php
View file

@ -68,11 +68,31 @@ class delete extends \phpbb\console\command\command
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$sql = 'SELECT COUNT(*) AS nb_missing_thumbnails
FROM ' . ATTACHMENTS_TABLE . '
WHERE thumbnail = 1';
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
$nb_missing_thumbnails = (int) $row['nb_missing_thumbnails'];
if ($nb_missing_thumbnails === 0)
{
$output->writeln('<info>' . $this->user->lang('NO_THUMBNAIL_TO_DELETE') . '</info>');
return 0;
}
$sql = 'SELECT attach_id, physical_filename, extension, real_filename, mimetype $sql = 'SELECT attach_id, physical_filename, extension, real_filename, mimetype
FROM ' . ATTACHMENTS_TABLE . ' FROM ' . ATTACHMENTS_TABLE . '
WHERE thumbnail = 1'; WHERE thumbnail = 1';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
if (!$input->getOption('verbose'))
{
$progress = $this->getHelper('progress');
$progress->start($output, $nb_missing_thumbnails);
}
$thumbnail_deleted = array(); $thumbnail_deleted = array();
$return = 0; $return = 0;
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
@ -102,6 +122,11 @@ class delete extends \phpbb\console\command\command
$output->writeln('<error>' . $this->user->lang('THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>'); $output->writeln('<error>' . $this->user->lang('THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
} }
} }
if (!$input->getOption('verbose'))
{
$progress->advance();
}
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -110,6 +135,11 @@ class delete extends \phpbb\console\command\command
$this->commit_changes($thumbnail_deleted); $this->commit_changes($thumbnail_deleted);
} }
if (!$input->getOption('verbose'))
{
$progress->finish();
}
return $return; return $return;
} }

30
phpBB/phpbb/console/command/thumbnail/generate.php
View file

@ -84,6 +84,20 @@ class generate extends \phpbb\console\command\command
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$sql = 'SELECT COUNT(*) AS nb_missing_thumbnails
FROM ' . ATTACHMENTS_TABLE . '
WHERE thumbnail = 0';
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
$nb_missing_thumbnails = (int) $row['nb_missing_thumbnails'];
if ($nb_missing_thumbnails === 0)
{
$output->writeln('<info>' . $this->user->lang('NO_THUMBNAIL_TO_GENERATE') . '</info>');
return 0;
}
$extensions = $this->cache->obtain_attach_extensions(true); $extensions = $this->cache->obtain_attach_extensions(true);
$sql = 'SELECT attach_id, physical_filename, extension, real_filename, mimetype $sql = 'SELECT attach_id, physical_filename, extension, real_filename, mimetype
@ -96,6 +110,12 @@ class generate extends \phpbb\console\command\command
require($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext); require($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
} }
if (!$input->getOption('verbose'))
{
$progress = $this->getHelper('progress');
$progress->start($output, $nb_missing_thumbnails);
}
$thumbnail_created = array(); $thumbnail_created = array();
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
@ -127,6 +147,11 @@ class generate extends \phpbb\console\command\command
} }
} }
} }
if (!$input->getOption('verbose'))
{
$progress->advance();
}
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -135,6 +160,11 @@ class generate extends \phpbb\console\command\command
$this->commit_changes($thumbnail_created); $this->commit_changes($thumbnail_created);
} }
if (!$input->getOption('verbose'))
{
$progress->finish();
}
return 0; return 0;
} }

3
phpBB/phpbb/console/command/thumbnail/recreate.php
View file

@ -54,6 +54,7 @@ class recreate extends \phpbb\console\command\command
$this->getApplication()->setAutoExit(false); $this->getApplication()->setAutoExit(false);
$output->writeln('<comment>' . $this->user->lang('THUMBNAIL_DELETING') . '</comment>');
$input_delete = new ArrayInput($parameters); $input_delete = new ArrayInput($parameters);
$return = $this->getApplication()->run($input_delete, $output); $return = $this->getApplication()->run($input_delete, $output);
@ -61,6 +62,8 @@ class recreate extends \phpbb\console\command\command
{ {
$parameters['command'] = 'thumbnail:generate'; $parameters['command'] = 'thumbnail:generate';
$output->writeln('');
$output->writeln('<comment>' . $this->user->lang('THUMBNAIL_GENERATING') . '</comment>');
$input_create = new ArrayInput($parameters); $input_create = new ArrayInput($parameters);
$return = $this->getApplication()->run($input_create, $output); $return = $this->getApplication()->run($input_create, $output);
} }