X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FCleanDuplicatesCommand.php;h=99170967018af889b1cf1e13d5beb5cb110308c5;hb=ada5d5b2694ec95c6ca84aa91f22add1973343e0;hp=b4aa4e470359cae82597b3173776876dee241aa7;hpb=a19e212f433be7d989f27c6271cba9a84fcefac9;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
index b4aa4e47..99170967 100644
--- a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
@@ -7,13 +7,14 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
class CleanDuplicatesCommand extends ContainerAwareCommand
{
- /** @var OutputInterface */
- protected $output;
+ /** @var SymfonyStyle */
+ protected $io;
protected $duplicates = 0;
@@ -32,7 +33,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
protected function execute(InputInterface $input, OutputInterface $output)
{
- $this->output = $output;
+ $this->io = new SymfonyStyle($input, $output);
$username = $input->getArgument('username');
@@ -41,20 +42,22 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
$user = $this->getUser($username);
$this->cleanDuplicates($user);
} catch (NoResultException $e) {
- $output->writeln(sprintf('User "%s" not found.', $username));
+ $this->io->error(sprintf('User "%s" not found.', $username));
return 1;
}
+
+ $this->io->success('Finished cleaning.');
} else {
$users = $this->getContainer()->get('wallabag_user.user_repository')->findAll();
- $output->writeln(sprintf('Cleaning through %d user accounts', count($users)));
+ $this->io->text(sprintf('Cleaning through %d user accounts', \count($users)));
foreach ($users as $user) {
- $output->writeln(sprintf('Processing user %s', $user->getUsername()));
+ $this->io->text(sprintf('Processing user %s', $user->getUsername()));
$this->cleanDuplicates($user);
}
- $output->writeln(sprintf('Finished cleaning. %d duplicates found in total', $this->duplicates));
+ $this->io->success(sprintf('Finished cleaning. %d duplicates found in total', $this->duplicates));
}
return 0;
@@ -68,7 +71,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
$repo = $this->getContainer()->get('wallabag_core.entry_repository');
- $entries = $repo->getAllEntriesIdAndUrl($user->getId());
+ $entries = $repo->findAllEntriesIdAndUrlByUserId($user->getId());
$duplicatesCount = 0;
$urls = [];
@@ -76,7 +79,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
$url = $this->similarUrl($entry['url']);
/* @var $entry Entry */
- if (in_array($url, $urls, true)) {
+ if (\in_array($url, $urls, true)) {
++$duplicatesCount;
$em->remove($repo->find($entry['id']));
@@ -88,13 +91,13 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
$this->duplicates += $duplicatesCount;
- $this->output->writeln(sprintf('Cleaned %d duplicates for user %s', $duplicatesCount, $user->getUserName()));
+ $this->io->text(sprintf('Cleaned %d duplicates for user %s', $duplicatesCount, $user->getUserName()));
}
private function similarUrl($url)
{
- if (in_array(substr($url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
- return substr($url, 0, strlen($url));
+ if (\in_array(substr($url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
+ return substr($url, 0, \strlen($url));
}
return $url;