Hash the urls to check if they exist

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Helper / ContentProxy.php

diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 2dc436f8ec2a6c59f37b6adbb0b5a5291ebdca3d..0534d27b22ca58fe48c88a3d34a8835bac864bfe 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -248,6 +248,8 @@ class ContentProxy
     {
         $this->updateOriginUrl($entry, $content['url']);
 
+        $entry->setHashedUrl(hash('md5', $entry->getUrl()));
+
         $this->setEntryDomainName($entry);
 
         if (!empty($content['title'])) {
@@ -256,18 +258,17 @@ class ContentProxy
             $entry->setTitle($content['open_graph']['og_title']);
         }
 
-        $html = $content['html'];
-        if (false === $html) {
-            $html = $this->fetchingErrorMessage;
+        if (empty($content['html'])) {
+            $content['html'] = $this->fetchingErrorMessage;
 
             if (!empty($content['open_graph']['og_description'])) {
-                $html .= '<p><i>But we found a short description: </i></p>';
-                $html .= $content['open_graph']['og_description'];
+                $content['html'] .= '<p><i>But we found a short description: </i></p>';
+                $content['html'] .= $content['open_graph']['og_description'];
             }
         }
 
-        $entry->setContent($html);
-        $entry->setReadingTime(Utils::getReadingTime($html));
+        $entry->setContent($content['html']);
+        $entry->setReadingTime(Utils::getReadingTime($content['html']));
 
         if (!empty($content['status'])) {
             $entry->setHttpStatus($content['status']);
@@ -321,43 +322,68 @@ class ContentProxy
      */
     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);
+        if (empty($url) || $entry->getUrl() === $url) {
+            return false;
+        }
 
-            $diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
-            $diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
+        $parsed_entry_url = parse_url($entry->getUrl());
+        $parsed_content_url = parse_url($url);
+
+        /**
+         * The following part computes the list of part changes between two
+         * parse_url arrays.
+         *
+         * As array_diff_assoc only computes changes to go from the left array
+         * to the right one, we make two differents arrays to have both
+         * directions. We merge these two arrays and sort keys before passing
+         * the result to the switch.
+         *
+         * The resulting array gives us all changing parts between the two
+         * urls: scheme, host, path, query and/or fragment.
+         */
+        $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);
+
+        if ($this->ignoreUrl($entry->getUrl())) {
+            $entry->setUrl($url);
 
-            $diff = array_merge($diff_ec, $diff_ce);
-            $diff_keys = array_keys($diff);
-            sort($diff_keys);
+            return false;
+        }
 
-            if ($this->ignoreUrl($entry->getUrl())) {
+        /**
+         * This switch case lets us apply different behaviors according to
+         * changing parts of urls.
+         *
+         * As $diff_keys is an array, we provide arrays as cases. ['path'] means
+         * 'only the path is different between the two urls' whereas
+         * ['fragment', 'query'] means 'only fragment and query string parts are
+         * different between the two urls'.
+         *
+         * Note that values in $diff_keys are sorted.
+         */
+        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);
-            } else {
-                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']:
-                    case ['fragment', 'query']:
-                        // noop
-                        break;
-                    default:
-                        if (empty($entry->getOriginUrl())) {
-                            $entry->setOriginUrl($entry->getUrl());
-                        }
-                        $entry->setUrl($url);
-                        break;
+                break;
+            case ['fragment']:
+                // noop
+                break;
+            default:
+                if (empty($entry->getOriginUrl())) {
+                    $entry->setOriginUrl($entry->getUrl());
                 }
-            }
+                $entry->setUrl($url);
+                break;
         }
     }