summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-11-25 19:04:05 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2015-11-25 19:52:22 +0100
commit052178a79f9099d1ce3c36e56334cdc15911ef09 (patch)
treea106b873613c6d49579337822316771ef9606028
parent52b701c8d484362f47a8c57d8e5005d2bc6d6e6f (diff)
also consider enclosure for fingerprint
-rw-r--r--db/item.php3
-rw-r--r--tests/unit/db/ItemTest.php6
-rw-r--r--tests/unit/fetcher/FeedFetcherTest.php3
3 files changed, 9 insertions, 3 deletions
diff --git a/db/item.php b/db/item.php
index a314baf7a..117e98fb5 100644
--- a/db/item.php
+++ b/db/item.php
@@ -221,7 +221,8 @@ class Item extends Entity implements IAPI, \JsonSerializable {
}
private function computeFingerprint() {
- return md5($this->getTitle() . $this->getUrl() . $this->getBody());
+ return md5($this->getTitle() . $this->getUrl() . $this->getBody() .
+ $this->getEnclosureLink());
}
public function setUrl($url) {
diff --git a/tests/unit/db/ItemTest.php b/tests/unit/db/ItemTest.php
index 89b14591e..831b8d624 100644
--- a/tests/unit/db/ItemTest.php
+++ b/tests/unit/db/ItemTest.php
@@ -293,13 +293,17 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
$title = 'a';
$body = 'b';
$url = 'http://google.com';
+ $link = 'ho';
+
$item = new Item();
$item->setBody($body);
$item->setTitle($title);
$item->setUrl($url);
+ $item->setEnclosureLink($link);
$item->generateSearchIndex();
- $this->assertEquals(md5($title . $url . $body), $item->getFingerprint());
+ $this->assertEquals(md5($title . $url . $body . $link),
+ $item->getFingerprint());
}
}
diff --git a/tests/unit/fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php
index ac486684b..276a3e485 100644
--- a/tests/unit/fetcher/FeedFetcherTest.php
+++ b/tests/unit/fetcher/FeedFetcherTest.php
@@ -222,7 +222,6 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$item->setGuidHash($this->guid);
$item->setBody($this->body);
$item->setLastModified($this->time);
- $item->generateSearchIndex();
$item->setRtl(false);
$this->expectItem('getAuthor', $this->author);
@@ -235,6 +234,8 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$item->setEnclosureMime($enclosureType);
$item->setEnclosureLink($this->enclosureLink);
}
+ $item->generateSearchIndex();
+
return $item;
}