oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Refactor updateOriginUrl to include new behaviors behaviors

Browse source 
- Leave origin_url unchanged if difference is an ending slash
- Leave origin_url unchanged if difference is scheme
- Ignore (noop) if difference is query string or fragment

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2018-09-06 22:26:20 +02:00
parent 781864b954
commit e07fadea76
2 changed files with 140 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,15 +246,7 @@ class ContentProxy
*/
private function stockEntry(Entry $entry, array $content)
{
// When a redirection occurs while fetching an entry
// we move the original url in origin_url property if empty
// and set the entry url with the final value
if (!empty($content['url']) && $entry->getUrl() !== $content['url']) {
if (empty($entry->getOriginUrl())) {
$entry->setOriginUrl($entry->getUrl());
}
$entry->setUrl($content['url']);
}
$this->updateOriginUrl($entry, $content['url']);
$this->setEntryDomainName($entry);
@ -320,6 +312,50 @@ class ContentProxy
}
}
/**
* Update the origin_url field when a redirection occurs
* This field is set if it is empty and new url does not match ignore list.
*
* @param Entry $entry
* @param string $url
*/
private function updateOriginUrl(Entry $entry, $url)
{
if (!empty($url) && $entry->getUrl() !== $url) {
$parsed_entry_url = parse_url($entry->getUrl());
$parsed_content_url = parse_url($url);
$diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
$diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
$diff = array_merge($diff_ec, $diff_ce);
$diff_keys = array_keys($diff);
sort($diff_keys);
switch ($diff_keys) {
case ['path']:
if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry
|| ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId
$entry->setUrl($url);
}
break;
case ['scheme']:
$entry->setUrl($url);
break;
case ['fragment']:
case ['query']:
// noop
break;
default:
if (empty($entry->getOriginUrl())) {
$entry->setOriginUrl($entry->getUrl());
}
$entry->setUrl($url);
break;
}
}
}
/**
* Validate that the given content has at least a title, an html and a url.
*