add print action

This commit is contained in:
2025-10-05 00:09:53 -07:00
parent a3976919eb
commit b941ee51b0
5 changed files with 39 additions and 24 deletions

View File

@@ -3,6 +3,9 @@ version = 1
[values] [values]
default-options = "tty=hvc0" default-options = "tty=hvc0"
[actions.welcome]
print.text = "Welcome to Sprout!"
[actions.chainload-kernel] [actions.chainload-kernel]
chainload.path = "$path" chainload.path = "$path"
chainload.options = ["$default-options"] chainload.options = ["$default-options"]
@@ -12,3 +15,6 @@ entry.title = "Boot Kernel $name"
entry.values.path = "\\EFI\\BOOT\\$name" entry.values.path = "\\EFI\\BOOT\\$name"
entry.actions = ["chainload-kernel"] entry.actions = ["chainload-kernel"]
values.name = ["kernel.efi"] values.name = ["kernel.efi"]
[[phases.startup]]
actions = ["welcome"]

View File

@@ -1,14 +1,19 @@
use crate::config::ActionDeclaration;
use crate::context::Context; use crate::context::Context;
use std::rc::Rc; use std::rc::Rc;
pub mod chainload; pub mod chainload;
pub mod print;
pub fn execute(context: Rc<Context>, action: &ActionDeclaration) { pub fn execute(context: Rc<Context>, name: impl AsRef<str>) {
let Some(action) = context.root().actions().get(name.as_ref()) else {
panic!("unknown action: {}", name.as_ref());
};
let context = context.finalize().freeze(); let context = context.finalize().freeze();
if let Some(chainload) = &action.chainload { if let Some(chainload) = &action.chainload {
chainload::chainload(context, chainload); chainload::chainload(context, chainload);
} else if let Some(print) = &action.print {
print::print(context, print);
} else { } else {
panic!("unknown action configuration"); panic!("unknown action configuration");
} }

7
src/actions/print.rs Normal file
View File

@@ -0,0 +1,7 @@
use crate::config::PrintConfiguration;
use crate::context::Context;
use std::rc::Rc;
pub fn print(context: Rc<Context>, configuration: &PrintConfiguration) {
println!("{}", context.stamp(&configuration.text));
}

View File

@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
#[derive(Serialize, Deserialize, Default, Clone)] #[derive(Serialize, Deserialize, Default, Clone)]
pub struct RootConfiguration { pub struct RootConfiguration {
#[serde(default = "default_version")] #[serde(default = "latest_version")]
pub version: u32, pub version: u32,
#[serde(default)] #[serde(default)]
pub values: BTreeMap<String, String>, pub values: BTreeMap<String, String>,
@@ -22,6 +22,8 @@ pub struct RootConfiguration {
pub struct ActionDeclaration { pub struct ActionDeclaration {
#[serde(default)] #[serde(default)]
pub chainload: Option<ChainloadConfiguration>, pub chainload: Option<ChainloadConfiguration>,
#[serde(default)]
pub print: Option<PrintConfiguration>,
} }
#[derive(Serialize, Deserialize, Default, Clone)] #[derive(Serialize, Deserialize, Default, Clone)]
@@ -68,11 +70,17 @@ pub struct ChainloadConfiguration {
pub options: Vec<String>, pub options: Vec<String>,
} }
#[derive(Serialize, Deserialize, Default, Clone)]
pub struct PrintConfiguration {
#[serde(default)]
pub text: String,
}
pub fn load() -> RootConfiguration { pub fn load() -> RootConfiguration {
let content = utils::read_file_contents("sprout.toml"); let content = utils::read_file_contents("sprout.toml");
toml::from_slice(&content).expect("unable to parse sprout.toml file") toml::from_slice(&content).expect("unable to parse sprout.toml file")
} }
pub fn default_version() -> u32 { pub fn latest_version() -> u32 {
1 1
} }

View File

@@ -2,6 +2,7 @@
use crate::config::PhaseConfiguration; use crate::config::PhaseConfiguration;
use crate::context::{Context, RootContext}; use crate::context::{Context, RootContext};
use log::info;
use std::rc::Rc; use std::rc::Rc;
pub mod actions; pub mod actions;
@@ -18,10 +19,6 @@ fn phase(context: Rc<Context>, phase: &[PhaseConfiguration]) {
let context = context.freeze(); let context = context.freeze();
for action in item.actions.iter() { for action in item.actions.iter() {
let Some(action) = context.root().actions().get(action) else {
panic!("unknown action: {}", action);
};
actions::execute(context.clone(), action); actions::execute(context.clone(), action);
} }
} }
@@ -31,6 +28,11 @@ fn main() {
setup::init(); setup::init();
let config = config::load(); let config = config::load();
if config.version > config::latest_version() {
panic!("unsupported configuration version: {}", config.version);
}
let mut root = RootContext::new(); let mut root = RootContext::new();
root.actions_mut().extend(config.actions.clone()); root.actions_mut().extend(config.actions.clone());
@@ -63,31 +65,18 @@ fn main() {
final_entries.push((context, entry)); final_entries.push((context, entry));
} }
println!("Boot Entries:"); info!("entries:");
for (index, (context, entry)) in final_entries.iter().enumerate() { for (index, (context, entry)) in final_entries.iter().enumerate() {
let title = context.stamp(&entry.title); let title = context.stamp(&entry.title);
println!(" Entry {}: {}", index + 1, title); info!(" entry {}: {}", index + 1, title);
} }
// let mut input = String::new();
// std::io::stdin().read_line(&mut input).expect("failed to read line");
// let input = input.trim();
// let Some(index) = input.parse::<usize>().ok().and_then(|value| if value > final_entries.len() {
// None
// } else {
// Some(value)
// }) else {
// eprintln!("invalid entry number");
// continue;
// };
let index = 1; let index = 1;
let (context, entry) = &final_entries[index - 1]; let (context, entry) = &final_entries[index - 1];
for action in &entry.actions { for action in &entry.actions {
let Some(action) = context.root().actions().get(action) else { let action = context.stamp(action);
panic!("unknown action: {}", action);
};
actions::execute(context.clone(), action); actions::execute(context.clone(), action);
} }
} }