From 535bfcbe80de5d697b768c3a657214fdeff0eac3 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 30 Oct 2016 09:58:39 +0100
Subject: Move related event things in Event folder

---
 .../CoreBundle/Event/Listener/LocaleListener.php   | 44 ++++++++++++++
 .../Event/Listener/UserLocaleListener.php          | 37 ++++++++++++
 .../Subscriber/SQLiteCascadeDeleteSubscriber.php   | 70 ++++++++++++++++++++++
 .../Event/Subscriber/TablePrefixSubscriber.php     | 51 ++++++++++++++++
 4 files changed, 202 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php
 create mode 100644 src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
 create mode 100644 src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
 create mode 100644 src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php b/src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php
new file mode 100644
index 00000000..b435d99e
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Listener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * @see http://symfony.com/doc/current/cookbook/session/locale_sticky_session.html
+ */
+class LocaleListener implements EventSubscriberInterface
+{
+    private $defaultLocale;
+
+    public function __construct($defaultLocale = 'en')
+    {
+        $this->defaultLocale = $defaultLocale;
+    }
+
+    public function onKernelRequest(GetResponseEvent $event)
+    {
+        $request = $event->getRequest();
+        if (!$request->hasPreviousSession()) {
+            return;
+        }
+
+        // try to see if the locale has been set as a _locale routing parameter
+        if ($locale = $request->attributes->get('_locale')) {
+            $request->getSession()->set('_locale', $locale);
+        } else {
+            // if no explicit locale has been set on this request, use one from the session
+            $request->setLocale($request->getSession()->get('_locale', $this->defaultLocale));
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            // must be registered before the default Locale listener
+            KernelEvents::REQUEST => [['onKernelRequest', 17]],
+        ];
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php b/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
new file mode 100644
index 00000000..367cdfb0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Listener;
+
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+
+/**
+ * Stores the locale of the user in the session after the
+ * login. This can be used by the LocaleListener afterwards.
+ *
+ * @see http://symfony.com/doc/master/cookbook/session/locale_sticky_session.html
+ */
+class UserLocaleListener
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * @param InteractiveLoginEvent $event
+     */
+    public function onInteractiveLogin(InteractiveLoginEvent $event)
+    {
+        $user = $event->getAuthenticationToken()->getUser();
+
+        if (null !== $user->getConfig()->getLanguage()) {
+            $this->session->set('_locale', $user->getConfig()->getLanguage());
+        }
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
new file mode 100644
index 00000000..3b4c4cf9
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Subscriber;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Wallabag\CoreBundle\Entity\Entry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
+
+/**
+ * SQLite doesn't care about cascading remove, so we need to manually remove associated stuf for an Entry.
+ * Foreign Key Support can be enabled by running `PRAGMA foreign_keys = ON;` at runtime (AT RUNTIME !).
+ * But it needs a compilation flag that not all SQLite instance has ...
+ *
+ * @see https://www.sqlite.org/foreignkeys.html#fk_enable
+ */
+class SQLiteCascadeDeleteSubscriber implements EventSubscriber
+{
+    private $doctrine;
+
+    /**
+     * @param \Doctrine\Bundle\DoctrineBundle\Registry $doctrine
+     */
+    public function __construct(Registry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
+    /**
+     * @return array
+     */
+    public function getSubscribedEvents()
+    {
+        return [
+            'preRemove',
+        ];
+    }
+
+    /**
+     * We removed everything related to the upcoming removed entry because SQLite can't handle it on it own.
+     * We do it in the preRemove, because we can't retrieve tags in the postRemove (because the entry id is gone).
+     *
+     * @param LifecycleEventArgs $args
+     */
+    public function preRemove(LifecycleEventArgs $args)
+    {
+        $entity = $args->getEntity();
+
+        if (!$this->doctrine->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver ||
+            !$entity instanceof Entry) {
+            return;
+        }
+
+        $em = $this->doctrine->getManager();
+
+        if (null !== $entity->getTags()) {
+            foreach ($entity->getTags() as $tag) {
+                $entity->removeTag($tag);
+            }
+        }
+
+        if (null !== $entity->getAnnotations()) {
+            foreach ($entity->getAnnotations() as $annotation) {
+                $em->remove($annotation);
+            }
+        }
+
+        $em->flush();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php
new file mode 100644
index 00000000..9013328f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Subscriber;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
+
+/**
+ * Puts a prefix to each table.
+ * This way were used instead of using the built-in strategy from Doctrine, using `naming_strategy`
+ * Because it conflicts with the DefaultQuoteStrategy (that espace table name, like user for Postgres)
+ * see #1498 for more detail.
+ *
+ * Solution from :
+ *      - http://stackoverflow.com/a/23860613/569101
+ *      - http://doctrine-orm.readthedocs.org/en/latest/reference/namingstrategy.html
+ */
+class TablePrefixSubscriber implements EventSubscriber
+{
+    protected $prefix = '';
+
+    public function __construct($prefix)
+    {
+        $this->prefix = (string) $prefix;
+    }
+
+    public function getSubscribedEvents()
+    {
+        return ['loadClassMetadata'];
+    }
+
+    public function loadClassMetadata(LoadClassMetadataEventArgs $args)
+    {
+        $classMetadata = $args->getClassMetadata();
+
+        // if we are in an inheritance hierarchy, only apply this once
+        if ($classMetadata->isInheritanceTypeSingleTable() && !$classMetadata->isRootEntity()) {
+            return;
+        }
+
+        $classMetadata->setTableName($this->prefix.$classMetadata->getTableName());
+
+        foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {
+            if ($mapping['type'] === ClassMetadataInfo::MANY_TO_MANY && isset($classMetadata->associationMappings[$fieldName]['joinTable']['name'])) {
+                $mappedTableName = $classMetadata->associationMappings[$fieldName]['joinTable']['name'];
+                $classMetadata->associationMappings[$fieldName]['joinTable']['name'] = $this->prefix.$mappedTableName;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 7f55941856549a3f5f45c42fdc171d66ff7ee297 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 30 Oct 2016 10:48:29 +0100
Subject: Use doctrine event to download images

---
 .../Event/Subscriber/DownloadImagesSubscriber.php  | 129 +++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
new file mode 100644
index 00000000..654edf31
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Subscriber;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Psr\Log\LoggerInterface;
+use Wallabag\CoreBundle\Helper\DownloadImages;
+use Wallabag\CoreBundle\Entity\Entry;
+use Doctrine\ORM\EntityManager;
+use Craue\ConfigBundle\Util\Config;
+
+class DownloadImagesSubscriber implements EventSubscriber
+{
+    private $configClass;
+    private $downloadImages;
+    private $logger;
+
+    /**
+     * We inject the class instead of the service otherwise it generates a circular reference with the EntityManager.
+     * So we build the service ourself when we got the EntityManager (in downloadImages).
+     */
+    public function __construct(DownloadImages $downloadImages, $configClass, LoggerInterface $logger)
+    {
+        $this->downloadImages = $downloadImages;
+        $this->configClass = $configClass;
+        $this->logger = $logger;
+    }
+
+    public function getSubscribedEvents()
+    {
+        return array(
+            'prePersist',
+            'preUpdate',
+        );
+    }
+
+    /**
+     * In case of an entry has been updated.
+     * We won't update the content field if it wasn't updated.
+     *
+     * @param LifecycleEventArgs $args
+     */
+    public function preUpdate(LifecycleEventArgs $args)
+    {
+        $entity = $args->getEntity();
+
+        if (!$entity instanceof Entry) {
+            return;
+        }
+
+        $em = $args->getEntityManager();
+
+        // field content has been updated
+        if ($args->hasChangedField('content')) {
+            $html = $this->downloadImages($em, $entity);
+
+            if (null !== $html) {
+                $args->setNewValue('content', $html);
+            }
+        }
+
+        // field preview picture has been updated
+        if ($args->hasChangedField('previewPicture')) {
+            $previewPicture = $this->downloadPreviewImage($em, $entity);
+
+            if (null !== $previewPicture) {
+                $entity->setPreviewPicture($previewPicture);
+            }
+        }
+    }
+
+    /**
+     * When a new entry is saved.
+     *
+     * @param LifecycleEventArgs $args
+     */
+    public function prePersist(LifecycleEventArgs $args)
+    {
+        $entity = $args->getEntity();
+
+        if (!$entity instanceof Entry) {
+            return;
+        }
+
+        $config = new $this->configClass();
+        $config->setEntityManager($args->getEntityManager());
+
+        // update all images inside the html
+        $html = $this->downloadImages($config, $entity);
+        if (null !== $html) {
+            $entity->setContent($html);
+        }
+
+        // update preview picture
+        $previewPicture = $this->downloadPreviewImage($config, $entity);
+        if (null !== $previewPicture) {
+            $entity->setPreviewPicture($previewPicture);
+        }
+    }
+
+    public function downloadImages(Config $config, Entry $entry)
+    {
+        // if ($config->get('download_images_with_rabbitmq')) {
+
+        // } else if ($config->get('download_images_with_redis')) {
+
+        // }
+
+        return $this->downloadImages->processHtml(
+            $entry->getContent(),
+            $entry->getUrl()
+        );
+    }
+
+    public function downloadPreviewImage(Config $config, Entry $entry)
+    {
+        // if ($config->get('download_images_with_rabbitmq')) {
+
+        // } else if ($config->get('download_images_with_redis')) {
+
+        // }
+
+        return $this->downloadImages->processSingleImage(
+            $entry->getPreviewPicture(),
+            $entry->getUrl()
+        );
+    }
+}
-- 
cgit v1.2.3


From 48656e0eaac006a80f21e9aec8900747fe76283a Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 30 Oct 2016 11:27:09 +0100
Subject: Fixing tests

---
 .../Event/Subscriber/DownloadImagesSubscriber.php  | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 654edf31..09f8e911 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -49,22 +49,23 @@ class DownloadImagesSubscriber implements EventSubscriber
             return;
         }
 
-        $em = $args->getEntityManager();
+        $config = new $this->configClass();
+        $config->setEntityManager($args->getEntityManager());
 
         // field content has been updated
         if ($args->hasChangedField('content')) {
-            $html = $this->downloadImages($em, $entity);
+            $html = $this->downloadImages($config, $entity);
 
-            if (null !== $html) {
+            if (false !== $html) {
                 $args->setNewValue('content', $html);
             }
         }
 
         // field preview picture has been updated
         if ($args->hasChangedField('previewPicture')) {
-            $previewPicture = $this->downloadPreviewImage($em, $entity);
+            $previewPicture = $this->downloadPreviewImage($config, $entity);
 
-            if (null !== $previewPicture) {
+            if (false !== $previewPicture) {
                 $entity->setPreviewPicture($previewPicture);
             }
         }
@@ -88,17 +89,25 @@ class DownloadImagesSubscriber implements EventSubscriber
 
         // update all images inside the html
         $html = $this->downloadImages($config, $entity);
-        if (null !== $html) {
+        if (false !== $html) {
             $entity->setContent($html);
         }
 
         // update preview picture
         $previewPicture = $this->downloadPreviewImage($config, $entity);
-        if (null !== $previewPicture) {
+        if (false !== $previewPicture) {
             $entity->setPreviewPicture($previewPicture);
         }
     }
 
+    /**
+     * Download all images from the html.
+     *
+     * @param Config $config
+     * @param Entry  $entry
+     *
+     * @return string|false False in case of async
+     */
     public function downloadImages(Config $config, Entry $entry)
     {
         // if ($config->get('download_images_with_rabbitmq')) {
@@ -113,6 +122,14 @@ class DownloadImagesSubscriber implements EventSubscriber
         );
     }
 
+    /**
+     * Download the preview picture.
+     *
+     * @param Config $config
+     * @param Entry  $entry
+     *
+     * @return string|false False in case of async
+     */
     public function downloadPreviewImage(Config $config, Entry $entry)
     {
         // if ($config->get('download_images_with_rabbitmq')) {
-- 
cgit v1.2.3


From 41ada277f066ea57947bce05bcda63962b7fea55 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 30 Oct 2016 19:50:00 +0100
Subject: Add instance url to the downloaded images

---
 src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 09f8e911..0792653e 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -110,6 +110,8 @@ class DownloadImagesSubscriber implements EventSubscriber
      */
     public function downloadImages(Config $config, Entry $entry)
     {
+        $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
+
         // if ($config->get('download_images_with_rabbitmq')) {
 
         // } else if ($config->get('download_images_with_redis')) {
@@ -132,6 +134,8 @@ class DownloadImagesSubscriber implements EventSubscriber
      */
     public function downloadPreviewImage(Config $config, Entry $entry)
     {
+        $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
+
         // if ($config->get('download_images_with_rabbitmq')) {
 
         // } else if ($config->get('download_images_with_redis')) {
-- 
cgit v1.2.3


From d1495dd0a456f0e35a09fb68679ee51f8d17bfe4 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 30 Oct 2016 21:30:45 +0100
Subject: Ability to enable/disable downloading images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled
---
 .../CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 0792653e..3f2d460c 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -52,6 +52,10 @@ class DownloadImagesSubscriber implements EventSubscriber
         $config = new $this->configClass();
         $config->setEntityManager($args->getEntityManager());
 
+        if (!$config->get('download_images_enabled')) {
+            return;
+        }
+
         // field content has been updated
         if ($args->hasChangedField('content')) {
             $html = $this->downloadImages($config, $entity);
@@ -87,6 +91,10 @@ class DownloadImagesSubscriber implements EventSubscriber
         $config = new $this->configClass();
         $config->setEntityManager($args->getEntityManager());
 
+        if (!$config->get('download_images_enabled')) {
+            return;
+        }
+
         // update all images inside the html
         $html = $this->downloadImages($config, $entity);
         if (false !== $html) {
-- 
cgit v1.2.3


From aedd6ca0fd212abd07ec59c5fd58ea2ca99198c5 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 31 Oct 2016 13:29:33 +0100
Subject: Add translations & migration

---
 .../Event/Subscriber/DownloadImagesSubscriber.php        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 3f2d460c..6fddcea9 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -111,6 +111,8 @@ class DownloadImagesSubscriber implements EventSubscriber
     /**
      * Download all images from the html.
      *
+     * @todo If we want to add async download, it should be done in that method
+     *
      * @param Config $config
      * @param Entry  $entry
      *
@@ -120,12 +122,6 @@ class DownloadImagesSubscriber implements EventSubscriber
     {
         $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
 
-        // if ($config->get('download_images_with_rabbitmq')) {
-
-        // } else if ($config->get('download_images_with_redis')) {
-
-        // }
-
         return $this->downloadImages->processHtml(
             $entry->getContent(),
             $entry->getUrl()
@@ -135,6 +131,8 @@ class DownloadImagesSubscriber implements EventSubscriber
     /**
      * Download the preview picture.
      *
+     * @todo If we want to add async download, it should be done in that method
+     *
      * @param Config $config
      * @param Entry  $entry
      *
@@ -144,12 +142,6 @@ class DownloadImagesSubscriber implements EventSubscriber
     {
         $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
 
-        // if ($config->get('download_images_with_rabbitmq')) {
-
-        // } else if ($config->get('download_images_with_redis')) {
-
-        // }
-
         return $this->downloadImages->processSingleImage(
             $entry->getPreviewPicture(),
             $entry->getUrl()
-- 
cgit v1.2.3


From e0597476d1d5f6a4a7d6ea9b76966465f3d22fb8 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 1 Nov 2016 14:49:02 +0100
Subject: Use custom event instead of Doctrine ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
---
 .../CoreBundle/Event/EntryDeletedEvent.php         |  26 +++++
 src/Wallabag/CoreBundle/Event/EntrySavedEvent.php  |  26 +++++
 .../Event/Subscriber/DownloadImagesSubscriber.php  | 117 ++++++++-------------
 3 files changed, 96 insertions(+), 73 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
 create mode 100644 src/Wallabag/CoreBundle/Event/EntrySavedEvent.php

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php b/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
new file mode 100644
index 00000000..e9061d04
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired as soon as an entry is deleted.
+ */
+class EntryDeletedEvent extends Event
+{
+    const NAME = 'entry.deleted';
+
+    protected $entry;
+
+    public function __construct(Entry $entry)
+    {
+        $this->entry = $entry;
+    }
+
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php b/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php
new file mode 100644
index 00000000..5fdb5221
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired as soon as an entry was saved.
+ */
+class EntrySavedEvent extends Event
+{
+    const NAME = 'entry.saved';
+
+    protected $entry;
+
+    public function __construct(Entry $entry)
+    {
+        $this->entry = $entry;
+    }
+
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 6fddcea9..4ebe837b 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -2,110 +2,85 @@
 
 namespace Wallabag\CoreBundle\Event\Subscriber;
 
-use Doctrine\Common\EventSubscriber;
-use Doctrine\ORM\Event\LifecycleEventArgs;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Psr\Log\LoggerInterface;
 use Wallabag\CoreBundle\Helper\DownloadImages;
 use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\CoreBundle\Event\EntryDeletedEvent;
 use Doctrine\ORM\EntityManager;
-use Craue\ConfigBundle\Util\Config;
 
-class DownloadImagesSubscriber implements EventSubscriber
+class DownloadImagesSubscriber implements EventSubscriberInterface
 {
-    private $configClass;
+    private $em;
     private $downloadImages;
+    private $enabled;
     private $logger;
 
-    /**
-     * We inject the class instead of the service otherwise it generates a circular reference with the EntityManager.
-     * So we build the service ourself when we got the EntityManager (in downloadImages).
-     */
-    public function __construct(DownloadImages $downloadImages, $configClass, LoggerInterface $logger)
+    public function __construct(EntityManager $em, DownloadImages $downloadImages, $enabled, LoggerInterface $logger)
     {
+        $this->em = $em;
         $this->downloadImages = $downloadImages;
-        $this->configClass = $configClass;
+        $this->enabled = $enabled;
         $this->logger = $logger;
     }
 
-    public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            'prePersist',
-            'preUpdate',
-        );
+        return [
+            EntrySavedEvent::NAME => 'onEntrySaved',
+            EntryDeletedEvent::NAME => 'onEntryDeleted',
+        ];
     }
 
     /**
-     * In case of an entry has been updated.
-     * We won't update the content field if it wasn't updated.
+     * Download images and updated the data into the entry.
      *
-     * @param LifecycleEventArgs $args
+     * @param EntrySavedEvent $event
      */
-    public function preUpdate(LifecycleEventArgs $args)
+    public function onEntrySaved(EntrySavedEvent $event)
     {
-        $entity = $args->getEntity();
+        if (!$this->enabled) {
+            $this->logger->debug('DownloadImagesSubscriber: disabled.');
 
-        if (!$entity instanceof Entry) {
             return;
         }
 
-        $config = new $this->configClass();
-        $config->setEntityManager($args->getEntityManager());
-
-        if (!$config->get('download_images_enabled')) {
-            return;
-        }
+        $entry = $event->getEntry();
 
-        // field content has been updated
-        if ($args->hasChangedField('content')) {
-            $html = $this->downloadImages($config, $entity);
+        $html = $this->downloadImages($entry);
+        if (false !== $html) {
+            $this->logger->debug('DownloadImagesSubscriber: updated html.');
 
-            if (false !== $html) {
-                $args->setNewValue('content', $html);
-            }
+            $entry->setContent($html);
         }
 
-        // field preview picture has been updated
-        if ($args->hasChangedField('previewPicture')) {
-            $previewPicture = $this->downloadPreviewImage($config, $entity);
+        // update preview picture
+        $previewPicture = $this->downloadPreviewImage($entry);
+        if (false !== $previewPicture) {
+            $this->logger->debug('DownloadImagesSubscriber: update preview picture.');
 
-            if (false !== $previewPicture) {
-                $entity->setPreviewPicture($previewPicture);
-            }
+            $entry->setPreviewPicture($previewPicture);
         }
+
+        $this->em->persist($entry);
+        $this->em->flush();
     }
 
     /**
-     * When a new entry is saved.
+     * Remove images related to the entry.
      *
-     * @param LifecycleEventArgs $args
+     * @param EntryDeletedEvent $event
      */
-    public function prePersist(LifecycleEventArgs $args)
+    public function onEntryDeleted(EntryDeletedEvent $event)
     {
-        $entity = $args->getEntity();
-
-        if (!$entity instanceof Entry) {
-            return;
-        }
-
-        $config = new $this->configClass();
-        $config->setEntityManager($args->getEntityManager());
+        if (!$this->enabled) {
+            $this->logger->debug('DownloadImagesSubscriber: disabled.');
 
-        if (!$config->get('download_images_enabled')) {
             return;
         }
 
-        // update all images inside the html
-        $html = $this->downloadImages($config, $entity);
-        if (false !== $html) {
-            $entity->setContent($html);
-        }
-
-        // update preview picture
-        $previewPicture = $this->downloadPreviewImage($config, $entity);
-        if (false !== $previewPicture) {
-            $entity->setPreviewPicture($previewPicture);
-        }
+        $this->downloadImages->removeImages($event->getEntry()->getId());
     }
 
     /**
@@ -113,16 +88,14 @@ class DownloadImagesSubscriber implements EventSubscriber
      *
      * @todo If we want to add async download, it should be done in that method
      *
-     * @param Config $config
-     * @param Entry  $entry
+     * @param Entry $entry
      *
      * @return string|false False in case of async
      */
-    public function downloadImages(Config $config, Entry $entry)
+    private function downloadImages(Entry $entry)
     {
-        $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
-
         return $this->downloadImages->processHtml(
+            $entry->getId(),
             $entry->getContent(),
             $entry->getUrl()
         );
@@ -133,16 +106,14 @@ class DownloadImagesSubscriber implements EventSubscriber
      *
      * @todo If we want to add async download, it should be done in that method
      *
-     * @param Config $config
-     * @param Entry  $entry
+     * @param Entry $entry
      *
      * @return string|false False in case of async
      */
-    public function downloadPreviewImage(Config $config, Entry $entry)
+    private function downloadPreviewImage(Entry $entry)
     {
-        $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
-
         return $this->downloadImages->processSingleImage(
+            $entry->getId(),
             $entry->getPreviewPicture(),
             $entry->getUrl()
         );
-- 
cgit v1.2.3