merging codeberg.org:tpart/jellything

1 files changed, 13 insertions, 12 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index edf562a..a9db370 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,14 +1,17 @@
 #![feature(box_syntax)]
 
-use crate::frontend::{pages::MyError, style::CSS_BUNDLE};
+use crate::frontend::{pages::MyError};
 use anyhow::{anyhow, Context};
 use database::Database;
-use frontend::pages::{home::page_home, node::page_library_node};
+use frontend::{
+    pages::{home::page_home, node::page_library_node},
+    style::{css_bundle, font_bundle},
+};
 use jellyremuxer::RemuxerContext;
 use library::Library;
 use log::{debug, warn};
 use rocket::{get, http::ContentType, launch, response::stream::ReaderStream, routes, State};
-use std::{fs::read_to_string, path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
 use tokio::io::{duplex, DuplexStream};
 use tokio_util::io::SyncIoBridge;
 
@@ -18,14 +21,12 @@ pub mod library;
 
 #[get("/assets/style.css")]
 async fn assets_style() -> (ContentType, String) {
-    (
-        ContentType::CSS,
-        if cfg!(debug_assertions) {
-            read_to_string("server/src/frontend/style/layout.css").unwrap()
-        } else {
-            CSS_BUNDLE.to_string()
-        },
-    )
+    (ContentType::CSS, css_bundle())
+}
+
+#[get("/assets/cantarell.woff2")]
+async fn assets_font() -> (ContentType, Vec<u8>) {
+    (ContentType::WOFF2, font_bundle())
 }
 
 #[get("/stream/<path..>?<selection>")]
@@ -83,6 +84,6 @@ fn rocket() -> _ {
 
     rocket::build().manage(state).mount(
         "/",
-        routes![page_home, page_library_node, assets_style, stream],
+        routes![page_home, page_library_node, assets_style, assets_font, stream],
     )
 }