aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r--src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php95
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php1
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php30
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php1
4 files changed, 126 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
new file mode 100644
index 00000000..fe2644f2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
@@ -0,0 +1,95 @@
1<?php
2
3namespace Wallabag\CoreBundle\Command;
4
5use Doctrine\ORM\NoResultException;
6use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
7use Symfony\Component\Console\Input\InputArgument;
8use Symfony\Component\Console\Input\InputInterface;
9use Symfony\Component\Console\Output\OutputInterface;
10use Wallabag\UserBundle\Entity\User;
11
12class GenerateUrlHashesCommand extends ContainerAwareCommand
13{
14 /** @var OutputInterface */
15 protected $output;
16
17 protected function configure()
18 {
19 $this
20 ->setName('wallabag:generate-hashed-urls')
21 ->setDescription('Generates hashed urls for each entry')
22 ->setHelp('This command helps you to generates hashes of the url of each entry, to check through API if an URL is already saved')
23 ->addArgument(
24 'username',
25 InputArgument::OPTIONAL,
26 'User to process entries'
27 );
28 }
29
30 protected function execute(InputInterface $input, OutputInterface $output)
31 {
32 $this->output = $output;
33
34 $username = $input->getArgument('username');
35
36 if ($username) {
37 try {
38 $user = $this->getUser($username);
39 $this->generateHashedUrls($user);
40 } catch (NoResultException $e) {
41 $output->writeln(sprintf('<error>User "%s" not found.</error>', $username));
42
43 return 1;
44 }
45 } else {
46 $users = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findAll();
47
48 $output->writeln(sprintf('Generating hashed urls for the %d user account entries', count($users)));
49
50 foreach ($users as $user) {
51 $output->writeln(sprintf('Processing user %s', $user->getUsername()));
52 $this->generateHashedUrls($user);
53 }
54 $output->writeln(sprintf('Finished generated hashed urls'));
55 }
56
57 return 0;
58 }
59
60 /**
61 * @param User $user
62 */
63 private function generateHashedUrls(User $user)
64 {
65 $em = $this->getContainer()->get('doctrine.orm.entity_manager');
66 $repo = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
67
68 $entries = $repo->findByUser($user->getId());
69
70 foreach ($entries as $entry) {
71 $entry->setHashedUrl(hash('sha512', $entry->getUrl()));
72 $em->persist($entry);
73 $em->flush();
74 }
75
76 $this->output->writeln(sprintf('Generated hashed urls for user %s', $user->getUserName()));
77 }
78
79 /**
80 * Fetches a user from its username.
81 *
82 * @param string $username
83 *
84 * @return \Wallabag\UserBundle\Entity\User
85 */
86 private function getUser($username)
87 {
88 return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username);
89 }
90
91 private function getDoctrine()
92 {
93 return $this->getContainer()->get('doctrine');
94 }
95}
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php
index fedad009..22882612 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php
@@ -32,6 +32,7 @@ class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface
32 32
33 $entry2 = new Entry($this->getReference('admin-user')); 33 $entry2 = new Entry($this->getReference('admin-user'));
34 $entry2->setUrl('http://0.0.0.0/entry2'); 34 $entry2->setUrl('http://0.0.0.0/entry2');
35 $entry2->setHashedUrl(hash('sha512', 'http://0.0.0.0/entry2'));
35 $entry2->setReadingTime(1); 36 $entry2->setReadingTime(1);
36 $entry2->setDomainName('domain.io'); 37 $entry2->setDomainName('domain.io');
37 $entry2->setMimetype('text/html'); 38 $entry2->setMimetype('text/html');
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 08a67c34..49affe2a 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -24,7 +24,8 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
24 * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, 24 * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
25 * indexes={ 25 * indexes={
26 * @ORM\Index(name="created_at", columns={"created_at"}), 26 * @ORM\Index(name="created_at", columns={"created_at"}),
27 * @ORM\Index(name="uid", columns={"uid"}) 27 * @ORM\Index(name="uid", columns={"uid"}),
28 * @ORM\Index(name="hashedurl", columns={"hashedurl"})
28 * } 29 * }
29 * ) 30 * )
30 * @ORM\HasLifecycleCallbacks() 31 * @ORM\HasLifecycleCallbacks()
@@ -73,6 +74,13 @@ class Entry
73 private $url; 74 private $url;
74 75
75 /** 76 /**
77 * @var string
78 *
79 * @ORM\Column(name="hashedurl", type="text", nullable=true)
80 */
81 private $hashedUrl;
82
83 /**
76 * @var bool 84 * @var bool
77 * 85 *
78 * @Exclude 86 * @Exclude
@@ -763,4 +771,24 @@ class Entry
763 771
764 return $this; 772 return $this;
765 } 773 }
774
775 /**
776 * @return string
777 */
778 public function getHashedUrl()
779 {
780 return $this->hashedUrl;
781 }
782
783 /**
784 * @param mixed $hashedUrl
785 *
786 * @return Entry
787 */
788 public function setHashedUrl($hashedUrl)
789 {
790 $this->hashedUrl = $hashedUrl;
791
792 return $this;
793 }
766} 794}
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 9a08db3d..83ecaa66 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -75,6 +75,7 @@ class ContentProxy
75 } 75 }
76 76
77 $entry->setUrl($content['url'] ?: $url); 77 $entry->setUrl($content['url'] ?: $url);
78 $entry->setHashedUrl(hash('sha512', $entry->getUrl()));
78 $entry->setTitle($title); 79 $entry->setTitle($title);
79 $entry->setContent($html); 80 $entry->setContent($html);
80 $entry->setHttpStatus(isset($content['status']) ? $content['status'] : ''); 81 $entry->setHttpStatus(isset($content['status']) ? $content['status'] : '');