YGGverse/YGGo
1
0
Fork 0
mirror of https://github.com/YGGverse/YGGo.git synced 2025-01-08 22:07:56 +00:00
Code Issues Projects Releases Wiki Activity

fix image search page errors

Browse Source
This commit is contained in:
ghost 2023-05-09 08:53:33 +03:00
parent 377d4935ad
commit ef4de6b245
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/mysql.php
View File

@ -282,6 +282,23 @@ class MySQL {
return $this->_db->lastInsertId(); return $this->_db->lastInsertId();
} }
public function setHostImageDescriptionData(int $hostImageId,
mixed $crc32data,
mixed $data,
int $time) {
$query = $this->_db->prepare('INSERT INTO `hostImageDescription` (`hostImageId`,
`crc32data`,
`data`,
`timeAdded`) VALUES (?, ?, ?, ?)
ON DUPLICATE KEY UPDATE `timeUpdated` = ?');
$query->execute([$hostImageId, $crc32data, $data, $time, $time]);
return $this->_db->lastInsertId();
}
public function deleteHostImageDescription(int $hostImageId) { public function deleteHostImageDescription(int $hostImageId) {
$query = $this->_db->prepare('DELETE FROM `hostImageDescription` WHERE `hostImageId` = ?'); $query = $this->_db->prepare('DELETE FROM `hostImageDescription` WHERE `hostImageId` = ?');
@ -446,7 +463,6 @@ class MySQL {
$query = $this->_db->prepare('SELECT `hostImage`.`hostImageId`, $query = $this->_db->prepare('SELECT `hostImage`.`hostImageId`,
`hostImage`.`uri`, `hostImage`.`uri`,
`hostImage`.`data`,
`hostImage`.`rank`, `hostImage`.`rank`,
`host`.`scheme`, `host`.`scheme`,
`host`.`name`, `host`.`name`,

31
public/search.php
View File

@ -342,8 +342,13 @@ if (!empty($q)) {
($hostImage->port ? ':' . $hostImage->port : false) . ($hostImage->port ? ':' . $hostImage->port : false) .
$hostImage->uri; $hostImage->uri;
// Get remote image data // Get local image data
if (empty($hostImage->data)) { if ($lastHostImageDescription = $db->getLastHostImageDescription($hostImage->hostImageId)) {
$hostImageURLencoded = $lastHostImageDescription->data;
// Get remote if local index not found or CRAWL_HOST_DEFAULT_META_ONLY enabled
} else {
// Init image request // Init image request
$hostImageCurl = new Curl($hostImageURL, PROXY_CURLOPT_USERAGENT); $hostImageCurl = new Curl($hostImageURL, PROXY_CURLOPT_USERAGENT);
@ -420,29 +425,15 @@ if (!empty($q)) {
Filter::mime($hostImageContentType), Filter::mime($hostImageContentType),
time()); time());
// Set host image description $db->setHostImageDescriptionData($hostImage->hostImageId,
// On link collection we knew meta but data, crc32($hostImageURLencoded),
// this step use latest description slice and insert the data received by curl request $hostImage->crawlMetaOnly ? null : $hostImageURLencoded,
if ($lastHostImageDescription = $db->getLastHostImageDescription($hostImage->hostImageId)) {
$db->setHostImageDescription($hostImage->hostImageId,
crc32($hostImageData),
$lastHostImageDescription->alt,
$lastHostImageDescription->title,
$hostImage->crawlMetaOnly ? null : $hostImageData,
time()); time());
} }
// Local image data exists
} else {
$hostImageURLencoded = $hostImage->data;
}
?> ?>
<div> <div>
<a href="<?php echo $hostImageURL ?>"> <a href="<?php echo $hostImageURL ?>">
<img src="<?php echo $hostImageURLencoded ?>" alt="<?php echo htmlentities($hostImage->description) ?>" title="<?php echo htmlentities($hostImageURL) ?>" class="image" /> <img src="<?php echo $hostImageURLencoded ?>" alt="<?php echo htmlentities($hostImageURL) ?>" title="<?php echo htmlentities($hostImageURL) ?>" class="image" />
</a> </a>
<?php $hostImageHostPagesTotal = $db->getHostImageHostPagesTotal($result->id) ?> <?php $hostImageHostPagesTotal = $db->getHostImageHostPagesTotal($result->id) ?>
<?php foreach ((array) $db->getHostImageHostPages($result->id, WEBSITE_SEARCH_IMAGE_RELATED_PAGE_RESULTS_LIMIT) as $hostPage) { ?> <?php foreach ((array) $db->getHostImageHostPages($result->id, WEBSITE_SEARCH_IMAGE_RELATED_PAGE_RESULTS_LIMIT) as $hostPage) { ?>