From 0a82f3ee27236a1d3bf561735fecef0c074a0d96 Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Sun, 8 Jan 2023 04:18:55 +0100 Subject: [PATCH] fixed panic: a field that should be there wasn't. --- js-client | 2 +- src/server.rs | 3 --- src/server/itemstore.rs | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/js-client b/js-client index d0add12..73cc1d1 160000 --- a/js-client +++ b/js-client @@ -1 +1 @@ -Subproject commit d0add12f0e5c75ee11129070f0f3084d08388424 +Subproject commit 73cc1d17ac36175bbcbb322864c029503a1378f7 diff --git a/src/server.rs b/src/server.rs index ba0fb7f..4928dce 100644 --- a/src/server.rs +++ b/src/server.rs @@ -276,14 +276,11 @@ 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); Response::builder() .header("content-type", "application/javascript") diff --git a/src/server/itemstore.rs b/src/server/itemstore.rs index 03eaa95..d71c565 100644 --- a/src/server/itemstore.rs +++ b/src/server/itemstore.rs @@ -32,8 +32,8 @@ impl Itemstore { "next_free_id".as_bytes().to_vec(), "_commit".as_bytes().to_vec(), "_type".as_bytes().to_vec(), - "renders".as_bytes().to_vec(), - "modules".as_bytes().to_vec(), + //"renders".as_bytes().to_vec(), + //"modules".as_bytes().to_vec(), ]; tr.set("0".to_string().into_bytes(), encode(keys)).await?; @@ -44,8 +44,8 @@ impl Itemstore { tr.set("0:next_free_id".to_string().into_bytes(), one.to_be_bytes()).await?; tr.set("0:_commit".to_string().into_bytes(), zero.to_be_bytes()).await?; tr.set("0:_type".to_string().into_bytes(), "mize-main".as_bytes().to_vec()).await?; - tr.set("0:renders".to_string().into_bytes(), Vec::new()); - tr.set("0:modules".to_string().into_bytes(), Vec::new()); + //tr.set("0:renders".to_string().into_bytes(), Vec::new()); + //tr.set("0:modules".to_string().into_bytes(), Vec::new()); tr.commit().await?; }, @@ -167,7 +167,7 @@ impl Itemstore { return Err(MizeError{ code: 104, kind: "data_storage::index_not_found".to_string(), - message: "Internal Datastorage Error: the Index of the Item was not found".to_string(), + message: "Internal Datastorage Error: the Index of the Item was not found, This means most likely that this item does not exist.".to_string(), }); }