From 5ec6d538db594b5443e7ede0e84f1f75366b0765 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 31 Dec 2017 19:13:42 +0100 Subject: [PATCH] Improved and simplified ProcessVisitsCommand thanks to SymfonyStyle --- .../CLI/src/Command/Visit/ProcessVisitsCommand.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php b/module/CLI/src/Command/Visit/ProcessVisitsCommand.php index 333a9239..f3e174d6 100644 --- a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php +++ b/module/CLI/src/Command/Visit/ProcessVisitsCommand.php @@ -10,6 +10,7 @@ use Shlinkio\Shlink\Core\Service\VisitServiceInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; use Zend\I18n\Translator\TranslatorInterface; class ProcessVisitsCommand extends Command @@ -51,13 +52,14 @@ class ProcessVisitsCommand extends Command public function execute(InputInterface $input, OutputInterface $output) { + $io = new SymfonyStyle($input, $output); $visits = $this->visitService->getUnlocatedVisits(); foreach ($visits as $visit) { $ipAddr = $visit->getRemoteAddr(); - $output->write(sprintf('%s %s', $this->translator->translate('Processing IP'), $ipAddr)); + $io->write(sprintf('%s %s', $this->translator->translate('Processing IP'), $ipAddr)); if ($ipAddr === self::LOCALHOST) { - $output->writeln( + $io->writeln( sprintf(' (%s)', $this->translator->translate('Ignored localhost address')) ); continue; @@ -65,11 +67,13 @@ class ProcessVisitsCommand extends Command try { $result = $this->ipLocationResolver->resolveIpLocation($ipAddr); + $location = new VisitLocation(); $location->exchangeArray($result); $visit->setVisitLocation($location); $this->visitService->saveVisit($visit); - $output->writeln(sprintf( + + $io->writeln(sprintf( ' (' . $this->translator->translate('Address located at "%s"') . ')', $location->getCityName() )); @@ -78,6 +82,6 @@ class ProcessVisitsCommand extends Command } } - $output->writeln($this->translator->translate('Finished processing all IPs')); + $io->success($this->translator->translate('Finished processing all IPs')); } }