ppc/mize
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot change to mr instead of modules-renders somewhere, and made Deserialize for MizeId work

Browse Source
This commit is contained in:
Sebastian Moser
2023-02-27 17:53:24 +01:00
parent 9825c5242b
commit e660f1372c
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js-client

Submodule js-client updated: 37f117e8e0...4bc7cc8fa0

3
src/server.rs
View File

@@ -326,7 +326,8 @@ async fn get_render_main(extract::Path(id): extract::Path<String>, State(mutexes
let render = renders.iter().filter(|&render| render.id == id).nth(0) 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")); .unwrap_or(renders.iter().filter(|&render| render.id == "first").nth(0).expect("there is no first render"));
let file_name = mutexes.mize_folder.clone() + "/modules-renders/" + &render.folder + "/" + &render.main; let file_name = mutexes.mize_folder.clone() + "/mr/" + &render.folder + "/" + &render.main;
println!("filenamd: {}", file_name);
Response::builder() Response::builder()
.header("content-type", "application/javascript") .header("content-type", "application/javascript")

4
src/server/itemstore.rs
View File

@@ -78,8 +78,8 @@ impl Itemstore {
Ok(Some(val)) => println!("item 0 already created"), Ok(Some(val)) => println!("item 0 already created"),
Ok(None) => { Ok(None) => {
let data = serde_json::json!({ let data = serde_json::json!({
"num_of_items": 0, "num_of_items": 1,
"next_free_id": 0, "next_free_id": 1,
"_commit": 0, "_commit": 0,
"mize-type": "mize-main", "mize-type": "mize-main",
"mize-id": "0" "mize-id": "0"

6
src/server/proto.rs
View File

@@ -243,13 +243,13 @@ impl<'de> Deserialize<'de> for MizeId {
where where
D: serde::Deserializer<'de>, D: serde::Deserializer<'de>,
{ {
struct MizeIdVisitor {} struct MizeIdVisitor;
impl<'de> Visitor<'de> for MizeIdVisitor { impl<'de> Visitor<'de> for MizeIdVisitor {
type Value = MizeId; type Value = MizeId;
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
formatter.write_str("Could not deserialize element") formatter.write_str("a MizeId id, which is a string that my start with @ or # ")
} }
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
@@ -291,7 +291,7 @@ impl<'de> Deserialize<'de> for MizeId {
// } // }
} }
deserializer.deserialize_map(MizeIdVisitor {}) deserializer.deserialize_str(MizeIdVisitor {})
} }
} }