Quick and dirty hack for id generation

xeoncross · Dec 18, 2013 · bf1d96a · bf1d96a
1 parent 1d3f58c
commit bf1d96a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/lib/PicoFeed/Parser.php b/lib/PicoFeed/Parser.php
@@ -159,4 +159,17 @@ public function getValidDate($format, $value)
 
         return 0;
     }
+
+
+    // Hardcoded list of hostname/token to exclude from id generation
+    public function isExcludedFromId($url)
+    {
+        $exclude_list = array('ap.org');
+
+        foreach ($exclude_list as $token) {
+            if (strpos($url, $token) !== false) return true;
+        }
+
+        return false;
+    }
 }
diff --git a/lib/PicoFeed/Parsers/Atom.php b/lib/PicoFeed/Parsers/Atom.php
@@ -26,15 +26,14 @@ public function execute()
         foreach ($xml->entry as $entry) {
 
             if (isset($entry->author->name)) {
-
                 $author = (string) $entry->author->name;
             }
 
             $id = (string) $entry->id;
 
             $item = new \StdClass;
             $item->url = $this->getUrl($entry);
-            $item->id = $this->generateId($id !== $item->url ? $id : $item->url, $this->url);
+            $item->id = $this->generateId($id !== $item->url ? $id : $item->url, $this->isExcludedFromId($this->url) ? '' : $this->url);
             $item->title = $this->stripWhiteSpace((string) $entry->title);
             $item->updated = $this->parseDate((string) $entry->updated);
             $item->author = $author;

diff --git a/lib/PicoFeed/Parsers/Rss10.php b/lib/PicoFeed/Parsers/Rss10.php
@@ -72,7 +72,7 @@ public function execute()
 
             if (empty($item->title)) $item->title = $item->url;
 
-            $item->id = $this->generateId($item->url, $this->url);
+            $item->id = $this->generateId($item->url, $this->isExcludedFromId($this->url) ? '' : $this->url);
             $item->content = $this->filterHtml($item->content, $item->url);
             $this->items[] = $item;
         }

diff --git a/lib/PicoFeed/Parsers/Rss20.php b/lib/PicoFeed/Parsers/Rss20.php
@@ -98,11 +98,11 @@ public function execute()
             if (isset($entry->guid) && isset($entry->guid['isPermaLink']) && (string) $entry->guid['isPermaLink'] != 'false') {
 
                 $id = (string) $entry->guid;
-                $item->id = $this->generateId($id !== '' && $id !== $item->url ? $id : $item->url, $this->url);
+                $item->id = $this->generateId($id !== '' && $id !== $item->url ? $id : $item->url, $this->isExcludedFromId($this->url) ? '' : $this->url);
             }
             else {
 
-                $item->id = $this->generateId($item->url, $this->url);
+                $item->id = $this->generateId($item->url, $this->isExcludedFromId($this->url) ? '' : $this->url);
             }
 
             if (empty($item->title)) $item->title = $item->url;