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

Use hash given url to avoid duplicate

Browse source 
Using hashed url we can ensure an index on them to ensure it's fast.
This commit is contained in:
Jeremy Benoist 2019-05-29 14:18:04 +02:00
parent b7fa51ae7d
commit f3bfb875e9
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
6 changed files with 134 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -27,9 +27,8 @@ use Wallabag\UserBundle\Entity\User;
* indexes={
* @ORM\Index(name="created_at", columns={"created_at"}),
* @ORM\Index(name="uid", columns={"uid"}),
* @ORM\Index(name="hashed_url_user_id", columns={"user_id", "hashed_url"}, options={"lengths"={null, 40}})
* },
* uniqueConstraints={@ORM\UniqueConstraint(name="IDX_entry_given_url",columns={"url", "given_url", "user_id"})}
* @ORM\Index(name="hashed_urls_user_id", columns={"user_id", "hashed_url", "hashed_given_url"}, options={"lengths"={null, 40, 40}})
* }
* )
* @ORM\HasLifecycleCallbacks()
* @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
@ -69,15 +68,8 @@ class Entry
private $title;
/**
* @var string
* Define the url fetched by wallabag (the final url after potential redirections).
*
* @ORM\Column(name="given_url", type="text", nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $givenUrl;
/**
* @var string
*
* @Assert\NotBlank()
@ -94,6 +86,35 @@ class Entry
*/
private $hashedUrl;
/**
* From where user retrieved/found the url (an other article, a twitter, or the given_url if non are provided).
*
* @var string
*
* @ORM\Column(name="origin_url", type="text", nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $originUrl;
/**
* Define the url entered by the user (without redirections).
*
* @var string
*
* @ORM\Column(name="given_url", type="text", nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $givenUrl;
/**
* @var string
*
* @ORM\Column(name="hashed_given_url", type="string", length=40, nullable=true)
*/
private $hashedGivenUrl;
/**
* @var bool
*
@ -273,15 +294,6 @@ class Entry
*/
private $tags;
/**
* @var string
*
* @ORM\Column(name="origin_url", type="text", nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $originUrl;
/*
* @param User $user
*/
@ -325,30 +337,6 @@ class Entry
return $this->title;
}
/**
* Set given url.
*
* @param string $givenUrl
*
* @return Entry
*/
public function setGivenUrl($givenUrl)
{
$this->givenUrl = $givenUrl;
return $this;
}
/**
* Get given Url.
*
* @return string
*/
public function getGivenUrl()
{
return $this->givenUrl;
}
/**
* Set url.
*
@ -956,6 +944,31 @@ class Entry
return $this->originUrl;
}
/**
* Set origin url.
*
* @param string $givenUrl
*
* @return Entry
*/
public function setGivenUrl($givenUrl)
{
$this->givenUrl = $givenUrl;
$this->hashedGivenUrl = UrlHasher::hashUrl($givenUrl);
return $this;
}
/**
* Get origin url.
*
* @return string
*/
public function getGivenUrl()
{
return $this->givenUrl;
}
/**
* @return string
*/