Skip to content

web search done right

embed all images directly in search page using base64

Mikkel Denkerfd3e99ca50de
diff --git a/.lfsconfig b/.lfsconfig
index 6b320b9a..c58d84d2 100644
--- a/.lfsconfig
+++ b/.lfsconfig
@@ -1,2 +1,2 @@
[lfs]
-url = "https://git-lfs.cuely.io/api/Cuely/Cuely"
+url = "https://lfs.cuely.io/api/Cuely/Cuely"
diff --git a/Cargo.lock b/Cargo.lock
index 9aed7b52..e56e471d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -674,6 +674,7 @@ dependencies = [
"askama",
"axum",
"axum-extra",
+ "base64",
"bincode",
"bzip2",
"chrono",
diff --git a/Cargo.toml b/Cargo.toml
index b72e7b99..386b2918 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,6 +56,7 @@ lalrpop-util = { version = "0.19.8", features = ["lexer"] }
serde_urlencoded = "0.7.1"
rust-stemmers = "1.2.0"
min-max-heap = "1.3.0"
+base64 = "0.13.0"
[dev-dependencies]
criterion = "0.3.6"
diff --git a/frontend/src/components/Entity.astro b/frontend/src/components/Entity.astro
index 41b7a95b..939e249c 100644
--- a/frontend/src/components/Entity.astro
+++ b/frontend/src/components/Entity.astro
@@ -9,13 +9,13 @@ export interface Props {
<div class="flex grow justify-center pt-10">
<div class="max-w-md flex flex-col items-center">
{
- askama.if_("let Some(image) = entity.image", () => (
+ askama.if_("let Some(image) = entity.image_base64", () => (
<div class="w-lg mb-5">
<a href="https://en.wikipedia.org/wiki/{{ entity.title|urlencode }}">
<img
class="h-full w-full rounded-full"
src={askama.fake(
- "/entity/image/{{ image|urlencode }}",
+ "data:image/png;base64, {{ image }}",
"{{image.avatar}}"
)}
/>
@@ -41,7 +41,7 @@ export interface Props {
{
askama.if_("!entity.info.is_empty()", () => (
<div class="mt-5 flex w-full flex-col px-4 text-sm">
- <div class="border-spacing-x-4 border-spacing-y-1.5 grid border-separate grid-cols-[auto_1fr] gap-x-4">
+ <div class="grid border-separate border-spacing-x-4 border-spacing-y-1.5 grid-cols-[auto_1fr] gap-x-4">
{askama.for_("(key, value) in entity.info", () => (
<>
<div class="text-gray-500">{askama`key $ {{word.adjective}}`}</div>
@@ -59,13 +59,13 @@ export interface Props {
<div class="flex">
{askama.for_("entity in entity.related_entities", () => (
<div class="flex flex-col items-center p-4">
- {askama.if_("let Some(image) = entity.image", () => (
+ {askama.if_("let Some(image) = entity.image_base64", () => (
<div class="mb-3 h-20 w-20">
<a href="/search?q={{ entity.title|urlencode }}">
<img
class="h-full w-full rounded-full object-cover"
src={askama.fake(
- "/entity/image/{{ image|urlencode }}",
+ "data:image/png;base64, {{ image }}",
"{{image.avatar}}"
)}
/>
diff --git a/frontend/src/pages/search.astro b/frontend/src/pages/search.astro
index 78f49f5d..f2a5ff4d 100644
--- a/frontend/src/pages/search.astro
+++ b/frontend/src/pages/search.astro
@@ -84,7 +84,7 @@ import Header from "../components/Header.astro";
<div class="mr-2 flex items-center">
<img
src={askama.fake(
- "/favicons/{{ item.domain|urlencode }}",
+ "data:image/png;base64, {{ item.favicon_base64 }}",
"{{image.avatar}}"
)}
width="13px"
diff --git a/src/frontend/search.rs b/src/frontend/search.rs
index da6e46e1..88305fb6 100644
--- a/src/frontend/search.rs
+++ b/src/frontend/search.rs
@@ -52,6 +52,7 @@ pub fn html_escape(s: &str) -> String {
pub struct DisplayedWebpage {
pub title: String,
pub url: String,
+ pub favicon_base64: String,
pub domain: String,
pub pretty_url: String,
pub snippet: String,
@@ -124,11 +125,19 @@ impl From<RetrievedWebpage> for DisplayedWebpage {
title += "...";
}
+ let favicon_bytes = webpage
+ .favicon
+ .map(|favicon| favicon.as_raw_bytes())
+ .unwrap_or_else(|| {
+ include_bytes!("../../frontend/dist/assets/images/globe.png").to_vec()
+ });
+
Self {
title,
url: webpage.url,
pretty_url,
domain,
+ favicon_base64: base64::encode(favicon_bytes),
snippet: webpage.snippet, // snippet has already been html-escaped.
body: webpage.body,
primary_image_uuid: webpage.primary_image.map(|image| image.uuid.to_string()),
@@ -141,7 +150,7 @@ impl From<RetrievedWebpage> for DisplayedWebpage {
pub struct DisplayedEntity {
pub title: String,
pub small_abstract: String,
- pub image: Option<String>,
+ pub image_base64: Option<String>,
pub related_entities: Vec<DisplayedEntity>,
pub info: Vec<(String, String)>,
}
@@ -197,10 +206,15 @@ impl DisplayedEntity {
let small_abstract = entity_link_to_html(entity_abstract, 300);
+ let image_base64 = entity
+ .image
+ .and_then(|image| searcher.entity_image(image))
+ .map(|image| base64::encode(image.as_raw_bytes()));
+
Self {
title: entity.title,
small_abstract,
- image: entity.image,
+ image_base64,
related_entities: entity
.related_entities
.into_iter()
@@ -318,6 +332,9 @@ pub async fn route(
None
}
});
+
+ let url: Url = webpage.url.clone().into();
+ webpage.favicon = state.searcher.favicon(&url.site().to_string().into());
webpage
})
.map(DisplayedWebpage::from)