From 40d10ae826af0fb125254ef3d07dd361d3d9223d Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Sun, 8 Jan 2023 00:01:06 +0100 Subject: [PATCH] ... --- js-client | 2 +- src/server.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js-client b/js-client index 2a75a7a..d0add12 160000 --- a/js-client +++ b/js-client @@ -1 +1 @@ -Subproject commit 2a75a7a891ab32da190b2dff359aec9babf54aae +Subproject commit d0add12f0e5c75ee11129070f0f3084d08388424 diff --git a/src/server.rs b/src/server.rs index 9027d62..ba0fb7f 100644 --- a/src/server.rs +++ b/src/server.rs @@ -91,7 +91,7 @@ pub enum ModuleKind { Node(), } -#[derive(Clone)] +#[derive(Clone, Debug)] pub struct Render { id: String, webroot: String, @@ -189,7 +189,7 @@ pub async fn run_server(args: Vec) { let webroot = webroot.clone(); let main = main.clone(); let id = id.clone(); - let folder = format!("{:?}", ren_mod.file_name()); + let folder = format!("{}", ren_mod.file_name().into_string().expect("filename has non utf8 chars in it......")); renders.push(Render {id, webroot, main, folder}); }; @@ -276,10 +276,12 @@ async fn render_item(uri: Uri) -> impl IntoResponse { //#[axum_macros::debug_handler] async fn get_render_main(extract::Path(id): extract::Path, State(mutexes): State) -> http::Response { let renders = &*mutexes.renders.lock().await; + println!("Render {:?}", renders); let render = renders.iter().filter(|&render| render.id == id).nth(0) .unwrap_or(renders.iter().filter(|&render| render.id == "first").nth(0).expect("there is no first render")); + println!("Render: {:?}", render); let file_name = mutexes.mize_folder.clone() + "/modules-renders/" + &render.folder + "/" + &render.main; println!("file_name: {}", file_name);