Spitfire/Search
Spitfire/Search
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Added default globe.svg for invalid favicons
Some checks failed
Run Integration Tests / test (push) Failing after 41s
Details

Browse source
This commit is contained in:
partisan 2025-05-30 23:14:49 +02:00
parent 66414952e8
commit 5032173609
8 changed files with 118 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/css/style.css
View file

@ -1850,4 +1850,8 @@ body, h1, p, a, input, button {
.leaflet-control-attribution a {
color: var(--link) !important;
}
}
}
.favicon.globe-fallback {
color: var(--font-fg);
}

3
static/images/globe.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="currentColor">
<path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Zm0-82q26-36 45-75t31-83H404q12 44 31 83t45 75Zm-104-16q-18-33-31.5-68.5T322-320H204q29 50 72.5 87t99.5 55Zm208 0q56-18 99.5-55t72.5-87H638q-9 38-22.5 73.5T584-178ZM170-400h136q-3-20-4.5-39.5T300-480q0-21 1.5-40.5T306-560H170q-5 20-7.5 39.5T160-480q0 21 2.5 40.5T170-400Zm216 0h188q3-20 4.5-39.5T580-480q0-21-1.5-40.5T574-560H386q-3 20-4.5 39.5T380-480q0 21 1.5 40.5T386-400Zm268 0h136q5-20 7.5-39.5T800-480q0-21-2.5-40.5T790-560H654q3 20 4.5 39.5T660-480q0 21-1.5 40.5T654-400Zm-16-240h118q-29-50-72.5-87T584-782q18 33 31.5 68.5T638-640Zm-234 0h152q-12-44-31-83t-45-75q-26 36-45 75t-31 83Zm-200 0h118q9-38 22.5-73.5T376-782q-56 18-99.5 55T204-640Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 986 B

52
static/js/dynamicscrollingtext.js
View file

@ -28,26 +28,59 @@
imgElement.closest('.favicon-wrapper')?.classList.remove('loading');
if (title) title.classList.remove('title-loading');
if (type === 'image' && imgElement.src.endsWith('/images/missing.svg')) {
if (type === 'image' && imgElement.src.endsWith('/images/globe.svg')) {
container.remove();
}
}
// Handle image/favicon loading errors
function handleImageError(imgElement, retryCount = 10, retryDelay = 500) {
function handleImageError(imgElement, retryCount = 8, retryDelay = 500) {
const isFavicon = !!imgElement.closest('.favicon-wrapper');
const container = imgElement.closest(type === 'image' ? '.image' : '.result_item');
const titleSelector = type === 'image' ? '.img_title' : '.result-url';
const title = container?.querySelector(titleSelector);
if (retryCount > 0) {
setTimeout(() => {
imgElement.src = imgElement.getAttribute('data-full');
imgElement.onerror = () => handleImageError(imgElement, retryCount - 1, retryDelay);
}, retryDelay);
const fullURL = imgElement.getAttribute('data-full');
if (retryCount > 0 && !imgElement.dataset.checked404) {
imgElement.dataset.checked404 = '1'; // avoid infinite loop
fetch(fullURL, { method: 'HEAD' })
.then(res => {
if (res.status === 404) {
fallbackToGlobe(imgElement);
} else {
setTimeout(() => {
imgElement.src = fullURL;
imgElement.onerror = () => handleImageError(imgElement, retryCount - 1, retryDelay);
}, retryDelay);
}
})
.catch(() => {
fallbackToGlobe(imgElement);
});
} else {
fallbackToGlobe(imgElement);
}
function fallbackToGlobe(imgElement) {
imgElement.closest('.favicon-wrapper')?.classList.remove('loading');
if (title) title.classList.remove('title-loading');
if (type === 'image') container.style.display = 'none';
if (isFavicon) {
const wrapper = imgElement.closest('.favicon-wrapper') || imgElement.parentElement;
const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
svg.setAttribute("viewBox", "0 -960 960 960");
svg.setAttribute("height", imgElement.height || "16");
svg.setAttribute("width", imgElement.width || "16");
svg.setAttribute("fill", "currentColor");
svg.classList.add("favicon", "globe-fallback");
svg.innerHTML = `<path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Zm0-82q26-36 45-75t31-83H404q12 44 31 83t45 75Zm-104-16q-18-33-31.5-68.5T322-320H204q29 50 72.5 87t99.5 55Zm208 0q56-18 99.5-55t72.5-87H638q-9 38-22.5 73.5T584-178ZM170-400h136q-3-20-4.5-39.5T300-480q0-21 1.5-40.5T306-560H170q-5 20-7.5 39.5T160-480q0 21 2.5 40.5T170-400Zm216 0h188q3-20 4.5-39.5T580-480q0-21-1.5-40.5T574-560H386q-3 20-4.5 39.5T380-480q0 21 1.5 40.5T386-400Zm268 0h136q5-20 7.5-39.5T800-480q0-21-2.5-40.5T790-560H654q3 20 4.5 39.5T660-480q0 21-1.5 40.5T654-400Zm-16-240h118q-29-50-72.5-87T584-782q18 33 31.5 68.5T638-640Zm-234 0h152q-12-44-31-83t-45-75q-26 36-45 75t-31 83Zm-200 0h118q9-38 22.5-73.5T376-782q-56 18-99.5 55T204-640Z"/>`;
imgElement.remove();
wrapper.appendChild(svg);
} else if (type === 'image') {
container?.remove();
}
}
}
@ -128,6 +161,7 @@
group.forEach(id => {
const elements = mediaMap.get(id);
const resolved = statusMap[id];
if (!elements) return;
if (resolved && resolved !== 'pending') {
elements.forEach(img => {
img.src = resolved;