oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-06 17:41:01 +00:00
Code Wiki Activity

updateOriginUrl: rewrite some if, resolving feedbacks from PR

Browse source 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2018-10-24 21:54:09 +02:00
parent b49c87acf1
commit 5ba5e22a09
1 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -321,43 +321,46 @@ class ContentProxy
*/ */
private function updateOriginUrl(Entry $entry, $url) private function updateOriginUrl(Entry $entry, $url)
{ {
if (!empty($url) && $entry->getUrl() !== $url) { if (empty($url) || $entry->getUrl() === $url) {
$parsed_entry_url = parse_url($entry->getUrl()); return false;
$parsed_content_url = parse_url($url); }
$diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url); $parsed_entry_url = parse_url($entry->getUrl());
$diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url); $parsed_content_url = parse_url($url);
$diff = array_merge($diff_ec, $diff_ce); $diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
$diff_keys = array_keys($diff); $diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
sort($diff_keys);
if ($this->ignoreUrl($entry->getUrl())) { $diff = array_merge($diff_ec, $diff_ce);
$entry->setUrl($url); $diff_keys = array_keys($diff);
} else { sort($diff_keys);
switch ($diff_keys) {
case ['path']: if ($this->ignoreUrl($entry->getUrl())) {
if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry $entry->setUrl($url);
|| ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId return false;
$entry->setUrl($url); }
}
break; switch ($diff_keys) {
case ['scheme']: case ['path']:
$entry->setUrl($url); if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry
break; || ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId
case ['fragment']: $entry->setUrl($url);
case ['query']:
case ['fragment', 'query']:
// noop
break;
default:
if (empty($entry->getOriginUrl())) {
$entry->setOriginUrl($entry->getUrl());
}
$entry->setUrl($url);
break;
} }
} break;
case ['scheme']:
$entry->setUrl($url);
break;
case ['fragment']:
case ['query']:
case ['fragment', 'query']:
// noop
break;
default:
if (empty($entry->getOriginUrl())) {
$entry->setOriginUrl($entry->getUrl());
}
$entry->setUrl($url);
break;
} }
} }