aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-12-14 11:19:44 +0100
committerGitHub <noreply@github.com>2017-12-14 11:19:44 +0100
commita68a80f654be86ae25d49420b86099302ce55bb6 (patch)
tree158cb4743920e91f87f2194287b81095f527bad2 /src
parent70265817aee257e7e635eda79ce3e037e3b4a242 (diff)
parentb457d7bd32b0eb228f6802d92630d8f0524f042f (diff)
downloadwallabag-a68a80f654be86ae25d49420b86099302ce55bb6.tar.gz
wallabag-a68a80f654be86ae25d49420b86099302ce55bb6.tar.zst
wallabag-a68a80f654be86ae25d49420b86099302ce55bb6.zip
Merge pull request #3442 from wallabag/empty-entry
Fix empty title and domain_name when exception is thrown during fetch
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php16
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php8
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php37
3 files changed, 57 insertions, 4 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 7d820c7e..acca219f 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -381,6 +381,14 @@ class EntryRestController extends WallabagRestController
381 } 381 }
382 } 382 }
383 383
384 if (empty($entry->getDomainName())) {
385 $this->get('wallabag_core.content_proxy')->setEntryDomainName($entry);
386 }
387
388 if (empty($entry->getTitle())) {
389 $this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry);
390 }
391
384 $em = $this->getDoctrine()->getManager(); 392 $em = $this->getDoctrine()->getManager();
385 $em->persist($entry); 393 $em->persist($entry);
386 $em->flush(); 394 $em->flush();
@@ -490,6 +498,14 @@ class EntryRestController extends WallabagRestController
490 $entry->setOriginUrl($data['origin_url']); 498 $entry->setOriginUrl($data['origin_url']);
491 } 499 }
492 500
501 if (empty($entry->getDomainName())) {
502 $this->get('wallabag_core.content_proxy')->setEntryDomainName($entry);
503 }
504
505 if (empty($entry->getTitle())) {
506 $this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry);
507 }
508
493 $em = $this->getDoctrine()->getManager(); 509 $em = $this->getDoctrine()->getManager();
494 $em->persist($entry); 510 $em->persist($entry);
495 $em->flush(); 511 $em->flush();
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 840dc254..b7fdea27 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -502,6 +502,14 @@ class EntryController extends Controller
502 $message = 'flashes.entry.notice.' . $prefixMessage . '_failed'; 502 $message = 'flashes.entry.notice.' . $prefixMessage . '_failed';
503 } 503 }
504 504
505 if (empty($entry->getDomainName())) {
506 $this->get('wallabag_core.content_proxy')->setEntryDomainName($entry);
507 }
508
509 if (empty($entry->getTitle())) {
510 $this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry);
511 }
512
505 $this->get('session')->getFlashBag()->add('notice', $message); 513 $this->get('session')->getFlashBag()->add('notice', $message);
506 } 514 }
507 515
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 4cc20c9c..fe795d42 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -145,6 +145,38 @@ class ContentProxy
145 } 145 }
146 146
147 /** 147 /**
148 * Helper to extract and save host from entry url.
149 *
150 * @param Entry $entry
151 */
152 public function setEntryDomainName(Entry $entry)
153 {
154 $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
155 if (false !== $domainName) {
156 $entry->setDomainName($domainName);
157 }
158 }
159
160 /**
161 * Helper to set a default title using:
162 * - url basename, if applicable
163 * - hostname.
164 *
165 * @param Entry $entry
166 */
167 public function setDefaultEntryTitle(Entry $entry)
168 {
169 $url = parse_url($entry->getUrl());
170 $path = pathinfo($url['path'], PATHINFO_BASENAME);
171
172 if (empty($path)) {
173 $path = $url['host'];
174 }
175
176 $entry->setTitle($path);
177 }
178
179 /**
148 * Stock entry with fetched or imported content. 180 * Stock entry with fetched or imported content.
149 * Will fall back to OpenGraph data if available. 181 * Will fall back to OpenGraph data if available.
150 * 182 *
@@ -155,10 +187,7 @@ class ContentProxy
155 { 187 {
156 $entry->setUrl($content['url']); 188 $entry->setUrl($content['url']);
157 189
158 $domainName = parse_url($entry->getUrl(), PHP_URL_HOST); 190 $this->setEntryDomainName($entry);
159 if (false !== $domainName) {
160 $entry->setDomainName($domainName);
161 }
162 191
163 if (!empty($content['title'])) { 192 if (!empty($content['title'])) {
164 $entry->setTitle($content['title']); 193 $entry->setTitle($content['title']);