From fad316151c282b2383fae751f7ca45373f1f26ed Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 24 Aug 2015 12:27:17 +0200
Subject: Integrate graby

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index a77489e2..bd87c6f4 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -31,10 +31,14 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $content = Extractor::extract($entry->getUrl());
-
-            $entry->setTitle($content->getTitle());
-            $entry->setContent($content->getBody());
+            $content = $this->get('wallabag_core.graby')->fetchContent($entry->getUrl());
+
+            $entry->setTitle($content['title']);
+            $entry->setContent($content['html']);
+            $entry->setMimetype($content['content_type']);
+            if (isset($content['open_graph']['og_image'])) {
+                $entry->setPreviewPicture($content['open_graph']['og_image']);
+            }
 
             $em = $this->getDoctrine()->getManager();
             $em->persist($entry);
-- 
cgit v1.2.3


From a1413a3da9e845a0f2e00e73069f5363864367bd Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 24 Aug 2015 12:35:02 +0200
Subject: CS

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index bd87c6f4..8e714763 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -6,7 +6,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Service\Extractor;
 use Wallabag\CoreBundle\Form\Type\NewEntryType;
 use Wallabag\CoreBundle\Form\Type\EditEntryType;
 use Wallabag\CoreBundle\Filter\EntryFilterType;
-- 
cgit v1.2.3


From d13de40db6fe5a006eb050908450b7adf3fcbf6c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 24 Aug 2015 19:52:31 +0200
Subject: Update url from graby

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 8e714763..e6580a57 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -32,6 +32,7 @@ class EntryController extends Controller
         if ($form->isValid()) {
             $content = $this->get('wallabag_core.graby')->fetchContent($entry->getUrl());
 
+            $entry->setUrl($content['url'] ?: $entry->getUrl());
             $entry->setTitle($content['title']);
             $entry->setContent($content['html']);
             $entry->setMimetype($content['content_type']);
-- 
cgit v1.2.3


From 558d9aabab7e01c2e2b506aa362c70a568b953aa Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 10 Sep 2015 21:57:25 +0200
Subject: Move fetching content in a separate class

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index e6580a57..b9e4e67e 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -30,15 +30,7 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $content = $this->get('wallabag_core.graby')->fetchContent($entry->getUrl());
-
-            $entry->setUrl($content['url'] ?: $entry->getUrl());
-            $entry->setTitle($content['title']);
-            $entry->setContent($content['html']);
-            $entry->setMimetype($content['content_type']);
-            if (isset($content['open_graph']['og_image'])) {
-                $entry->setPreviewPicture($content['open_graph']['og_image']);
-            }
+            $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
 
             $em = $this->getDoctrine()->getManager();
             $em->persist($entry);
-- 
cgit v1.2.3