mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-04-24 19:04:19 +00:00
Code Issues Projects Releases Wiki Activity

EntryRestController::getEntriesExistsAction: always find by hashed url

Browse source 
Simplify the logic from #3158 by hashing all the urls from the request,
and only doing a search by hash. This allows to get performance benefits
from the new indexed hash column even when using older clients that do
not hash the URL in the request.

Fixes: #3158, #3919

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
This commit is contained in:
Olivier Mehani 2019-05-02 21:19:20 +10:00 committed by Jeremy Benoist
parent 65b495e75b
commit 31e276fc16
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
1 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -43,50 +43,59 @@ class EntryRestController extends WallabagRestController
$returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id'); $returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id');
$urls = $request->query->get('urls', []);
$hashedUrls = $request->query->get('hashed_urls', []); $hashedUrls = $request->query->get('hashed_urls', []);
// handle multiple urls first
if (!empty($hashedUrls)) {
$results = [];
foreach ($hashedUrls as $hashedUrl) {
$res = $repo->findByHashedUrlAndUserId($hashedUrl, $this->getUser()->getId());
$results[$hashedUrl] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
}
// @deprecated, to be remove in 3.0
if (!empty($urls)) {
$results = [];
foreach ($urls as $url) {
$res = $repo->findByUrlAndUserId($url, $this->getUser()->getId());
$results[$url] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
}
// let's see if it is a simple url?
$url = $request->query->get('url', '');
$hashedUrl = $request->query->get('hashed_url', ''); $hashedUrl = $request->query->get('hashed_url', '');
if (!empty($hashedUrl)) {
$hashedUrls[] = $hashedUrl;
}
if (empty($url) && empty($hashedUrl)) { $urls = $request->query->get('urls', []);
$url = $request->query->get('url', '');
if (!empty($url)) {
$urls[] = $url;
}
$urlHashMap = [];
foreach($urls as $urlToHash) {
$urlHash = hash('sha1', $urlToHash); // XXX: the hash logic would better be in a separate util to avoid duplication with GenerateUrlHashesCommand::generateHashedUrls
$hashedUrls[] = $urlHash;
$urlHashMap[$urlHash] = $urlToHash;
}
if (empty($hashedUrls)) {
throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId()); throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
} }
$method = 'findByUrlAndUserId'; $results = [];
if (!empty($hashedUrl)) { foreach ($hashedUrls as $hashedUrlToSearch) {
$method = 'findByHashedUrlAndUserId'; $res = $repo->findByHashedUrlAndUserId($hashedUrlToSearch, $this->getUser()->getId());
$url = $hashedUrl;
$results[$hashedUrlToSearch] = $this->returnExistInformation($res, $returnId);
} }
$res = $repo->$method($url, $this->getUser()->getId()); $results = $this->replaceUrlHashes($results, $urlHashMap);
return $this->sendResponse(['exists' => $this->returnExistInformation($res, $returnId)]); if (!empty($url) || !empty($hashedUrl)) {
$hu = array_keys($results)[0];
return $this->sendResponse(['exists' => $results[$hu]]);
}
return $this->sendResponse($results);
}
/**
* Replace the hashedUrl keys in $results with the unhashed URL from the
* request, as recorded in $urlHashMap.
*/
private function replaceUrlHashes(array $results, array $urlHashMap) {
$newResults = [];
foreach($results as $hash => $res) {
if (isset($urlHashMap[$hash])) {
$newResults[$urlHashMap[$hash]] = $res;
} else {
$newResults[$hash] = $res;
}
}
return $newResults;
} }
/** /**