diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-18 15:18:08 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-09 09:21:51 +0200 |
| commit | 24e39545ae77a78fb1f5350b4fe5658c924ad75c (patch) | |
| tree | 33e6b2501c093f045d497d858b8e027bfc38fd3a /phpBB | |
| parent | a55c83b77168e77fd4d0101b8c58741f442b2d39 (diff) | |
| download | forums-24e39545ae77a78fb1f5350b4fe5658c924ad75c.tar forums-24e39545ae77a78fb1f5350b4fe5658c924ad75c.tar.gz forums-24e39545ae77a78fb1f5350b4fe5658c924ad75c.tar.bz2 forums-24e39545ae77a78fb1f5350b4fe5658c924ad75c.tar.xz forums-24e39545ae77a78fb1f5350b4fe5658c924ad75c.zip | |
[ticket/12692] Add output
PHPBB3-12692
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/cli.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/delete.php | 30 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/generate.php | 30 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/recreate.php | 3 |
4 files changed, 69 insertions, 0 deletions
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index f0e5dd6120..7dd8403ed4 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -96,4 +96,10 @@ $lang = array_merge($lang, array( 'THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.', 'THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.', '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.', )); diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php index b60ea5238f..b57fcc681f 100644 --- a/phpBB/phpbb/console/command/thumbnail/delete.php +++ b/phpBB/phpbb/console/command/thumbnail/delete.php @@ -68,11 +68,31 @@ class delete extends \phpbb\console\command\command */ 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 FROM ' . ATTACHMENTS_TABLE . ' WHERE thumbnail = 1'; $result = $this->db->sql_query($sql); + if (!$input->getOption('verbose')) + { + $progress = $this->getHelper('progress'); + $progress->start($output, $nb_missing_thumbnails); + } + $thumbnail_deleted = array(); $return = 0; 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>'); } } + + if (!$input->getOption('verbose')) + { + $progress->advance(); + } } $this->db->sql_freeresult($result); @@ -110,6 +135,11 @@ class delete extends \phpbb\console\command\command $this->commit_changes($thumbnail_deleted); } + if (!$input->getOption('verbose')) + { + $progress->finish(); + } + return $return; } diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index 640d971b5d..068bd0ff94 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -84,6 +84,20 @@ class generate extends \phpbb\console\command\command */ 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); $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); } + if (!$input->getOption('verbose')) + { + $progress = $this->getHelper('progress'); + $progress->start($output, $nb_missing_thumbnails); + } + $thumbnail_created = array(); 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); @@ -135,6 +160,11 @@ class generate extends \phpbb\console\command\command $this->commit_changes($thumbnail_created); } + if (!$input->getOption('verbose')) + { + $progress->finish(); + } + return 0; } diff --git a/phpBB/phpbb/console/command/thumbnail/recreate.php b/phpBB/phpbb/console/command/thumbnail/recreate.php index 624e4e507f..ec093161af 100644 --- a/phpBB/phpbb/console/command/thumbnail/recreate.php +++ b/phpBB/phpbb/console/command/thumbnail/recreate.php @@ -54,6 +54,7 @@ class recreate extends \phpbb\console\command\command $this->getApplication()->setAutoExit(false); + $output->writeln('<comment>' . $this->user->lang('THUMBNAIL_DELETING') . '</comment>'); $input_delete = new ArrayInput($parameters); $return = $this->getApplication()->run($input_delete, $output); @@ -61,6 +62,8 @@ class recreate extends \phpbb\console\command\command { $parameters['command'] = 'thumbnail:generate'; + $output->writeln(''); + $output->writeln('<comment>' . $this->user->lang('THUMBNAIL_GENERATING') . '</comment>'); $input_create = new ArrayInput($parameters); $return = $this->getApplication()->run($input_create, $output); } |