diff --git a/crates/app/src/model.rs b/crates/app/src/model.rs index d757b431..113ec3b4 100644 --- a/crates/app/src/model.rs +++ b/crates/app/src/model.rs @@ -335,40 +335,29 @@ pub struct Configuration { impl Configuration { pub fn from_path (path: &impl AsRef, _watch: bool) -> Usually { - let mut config = Self { path: path.as_ref().into(), ..Default::default() }; - let mut dsl = read_and_leak(path.as_ref())?; - let mut head: Option> = dsl.head()?.map(Into::into); - let mut tail: Option> = dsl.tail()?.map(Into::into); - loop { - if let Some(exp) = head.exp()? { - match exp.head()?.key()? { - Some("name") => match exp.tail()?.text()? { - Some(name) => config.name = Some(name.into()), - _ => return Err(format!("missing name definition").into()) - }, - Some("info") => match exp.tail()?.text()? { - Some(info) => config.info = Some(info.into()), - _ => return Err(format!("missing info definition").into()) - }, - Some("keys") => match exp.tail()? { - Some(keys) => config.keys = EventMap::from_dsl(&mut &keys)?, - _ => return Err(format!("missing keys definition").into()) - }, - Some("view") => match exp.tail()? { - Some(tail) => config.view = tail.src().into(), - _ => return Err(format!("missing view definition").into()) - }, - Some(k) => return Err(format!("(e3) unexpected key {k:?} in {exp:?}").into()), - None => return Err(format!("(e2) unexpected exp {exp:?}").into()), - } - } else { - break - } - if let Some(next) = tail { - head = next.head()?.map(Into::into); - tail = next.tail()?.map(Into::into); - } else { - break + let mut config = Self::default(); + config.path = path.as_ref().into(); + let mut dsl = read_and_leak(path.as_ref())?; + while let Some(mut exp) = dsl.exp_next()? { + match exp.exp_head()?.key()? { + Some("name") => match exp.text()? { + Some(name) => config.name = Some(name.into()), + _ => return Err(format!("missing name definition").into()) + }, + Some("info") => match exp.text()? { + Some(info) => config.info = Some(info.into()), + _ => return Err(format!("missing info definition").into()) + }, + Some("keys") => match exp.text()? { + Some(keys) => config.keys = EventMap::from_dsl(keys)?, + _ => return Err(format!("missing keys definition").into()) + }, + Some("view") => match exp.exp_tail()? { + Some(tail) => config.view = tail.src().into(), + _ => return Err(format!("missing view definition").into()) + }, + Some(k) => return Err(format!("(e3) unexpected key {k:?} in {exp:?}").into()), + None => return Err(format!("(e2) unexpected exp {exp:?}").into()), } } Ok(config) diff --git a/crates/app/src/view.rs b/crates/app/src/view.rs index 75fef228..2702c49b 100644 --- a/crates/app/src/view.rs +++ b/crates/app/src/view.rs @@ -24,7 +24,7 @@ impl> Content for ErrorBoundary { impl App { pub fn view (model: &Self) -> impl Content + '_ { - ErrorBoundary::new(Ok(Some(Tui::bg(Black, model.view_menu())))) + ErrorBoundary::new(Ok(Some(Tui::bg(Black, model.view_nil())))) //ErrorBoundary::new(Take::take(model, &mut model.config.view.clone())) //ErrorBoundary::new(Give::give(model, &mut model.config.view.clone())) } @@ -37,13 +37,6 @@ impl App { pub fn view_nil (&self) -> impl Content + '_ { "nil" } - pub fn view_menu (&self) -> impl Content + use<'_> { - Stack::south(|add: &mut dyn FnMut(&dyn Render)|{ - add(&Tui::bold(true, "tek")); - add(&""); - add(&"+ new session"); - }) - } pub fn view_dialog (&self) -> impl Content + use<'_> { self.dialog.as_ref().map(|dialog|Bsp::b("", Fixed::xy(70, 23, Tui::fg_bg(Rgb(255,255,255), Rgb(16,16,16), Bsp::b( diff --git a/deps/tengri b/deps/tengri index 85c30538..360b404b 160000 --- a/deps/tengri +++ b/deps/tengri @@ -1 +1 @@ -Subproject commit 85c305385bc08ef805afb113f677c510027a7234 +Subproject commit 360b404b69abb1ec4e0e9959667e08d4b99c6131