joshuacoles/wallos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: use brave search for the logos if google fails (#169)

Browse Source
This commit is contained in:
Miguel Ribeiro 2024-02-29 20:47:07 +01:00 committed by GitHub
parent 284cf62fcf
commit fff783e4e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
endpoints/logos/search.php
View File

@ -1,9 +1,10 @@
<?php
if (isset($_GET['search'])) {
$searchTerm = urlencode($_GET['search'] . " logo");
$url = "https://www.google.com/search?q={$searchTerm}&tbm=isch&tbs=iar:xw,ift:png";
// Use cURL to fetch the search results page
$url = "https://www.google.com/search?q={$searchTerm}&tbm=isch&tbs=iar:xw,ift:png";
$backupUrl = "https://search.brave.com/search?q={$searchTerm}";
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@ -24,10 +25,29 @@
$response = curl_exec($ch);
if ($response === false) {
echo json_encode(['error' => 'Failed to fetch data from Google.']);
// If cURL fails to access google images, use brave image search as a backup
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $backupUrl);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$envVars = array_change_key_case($_SERVER, CASE_LOWER);
$httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;
$httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;
if (!empty($httpProxy)) {
curl_setopt($ch, CURLOPT_PROXY, $httpProxy);
} elseif (!empty($httpsProxy)) {
curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);
}
$response = curl_exec($ch);
if ($response === false) {
echo json_encode(['error' => 'Failed to fetch data from Google.']);
} else {
$imageUrls = extractImageUrlsFromPage($response);
header('Content-Type: application/json');
echo json_encode(['imageUrls' => $imageUrls]);
}
} else {
// Parse the HTML response to extract image URLs
$imageUrls = extractImageUrlsFromGoogle($response);
$imageUrls = extractImageUrlsFromPage($response);
// Pass the image URLs to the client
header('Content-Type: application/json');
@ -39,7 +59,7 @@
echo json_encode(['error' => 'Invalid request.']);
}
function extractImageUrlsFromGoogle($html) {
function extractImageUrlsFromPage($html) {
$imageUrls = [];
$doc = new DOMDocument();
@ -48,8 +68,10 @@
$imgTags = $doc->getElementsByTagName('img');
foreach ($imgTags as $imgTag) {
$src = $imgTag->getAttribute('src');
if (filter_var($src, FILTER_VALIDATE_URL)) {
$imageUrls[] = $src;
if (!strstr($imgTag->getAttribute('class'), "favicon") && !strstr($imgTag->getAttribute('class'), "logo")) {
if (filter_var($src, FILTER_VALIDATE_URL)) {
$imageUrls[] = $src;
}
}
}

2
includes/version.php
View File

@ -1,3 +1,3 @@
<?php
$version = "v1.9.1";
$version = "v1.10.0";
?>

3
scripts/dashboard.js
View File

@ -213,6 +213,9 @@ function displayImageResults(imageSources) {
img.onclick = function() {
selectWebLogo(src);
};
img.onerror = function() {
this.parentNode.removeChild(this);
};
logoResults.appendChild(img);
});
}