Add a main config
Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
parent
9a8441ed7d
commit
0af4532a88
3 changed files with 60 additions and 5 deletions
|
|
@ -1,17 +1,30 @@
|
|||
#![allow(dead_code)]
|
||||
|
||||
use camino::Utf8Path;
|
||||
use camino::Utf8PathBuf;
|
||||
use clap::Parser;
|
||||
use clap::Subcommand;
|
||||
use clap::ValueHint;
|
||||
use human_panic::Metadata;
|
||||
use kdl::KdlDocument;
|
||||
use miette::LabeledSpan;
|
||||
use miette::WrapErr;
|
||||
use tracing::info;
|
||||
|
||||
mod parsing;
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
struct Args {
|
||||
#[arg(short, long, value_hint(ValueHint::DirPath))]
|
||||
path: Utf8PathBuf,
|
||||
root_folder: Option<Utf8PathBuf>,
|
||||
|
||||
#[arg(
|
||||
short,
|
||||
long,
|
||||
value_hint(ValueHint::FilePath),
|
||||
default_value_t = Utf8PathBuf::from("plaixt.kdl")
|
||||
)]
|
||||
config: Utf8PathBuf,
|
||||
|
||||
#[command(subcommand)]
|
||||
mode: ArgMode,
|
||||
|
|
@ -22,6 +35,11 @@ enum ArgMode {
|
|||
Dump,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Config {
|
||||
root_folder: Utf8PathBuf,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> miette::Result<()> {
|
||||
human_panic::setup_panic!(
|
||||
|
|
@ -32,16 +50,51 @@ async fn main() -> miette::Result<()> {
|
|||
tracing_subscriber::fmt().pretty().init();
|
||||
|
||||
let args = Args::parse();
|
||||
|
||||
let config = parse_config(&args.config).await?;
|
||||
let root_folder = args.root_folder.as_ref().unwrap_or(&config.root_folder);
|
||||
|
||||
let load_records = async {
|
||||
let definitions = parsing::load_definitions(args.path.join("definitions")).await?;
|
||||
parsing::load_records(args.path, &definitions).await
|
||||
let definitions = parsing::load_definitions(&root_folder.join("definitions")).await?;
|
||||
parsing::load_records(root_folder, &definitions).await
|
||||
};
|
||||
|
||||
match args.mode {
|
||||
ArgMode::Dump => {
|
||||
let records = load_records.await?;
|
||||
|
||||
info!("Got records: {records:#?}");
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn parse_config(path: &Utf8Path) -> miette::Result<Config> {
|
||||
let data = tokio::fs::read_to_string(path)
|
||||
.await
|
||||
.map_err(|e| miette::miette!(e))
|
||||
.wrap_err_with(|| miette::miette!("Could not read configuration at \"{path}\""))?;
|
||||
|
||||
let doc: KdlDocument = data
|
||||
.parse()
|
||||
.map_err(|e| miette::Error::from(e).with_source_code(data.clone()))?;
|
||||
|
||||
Ok(Config {
|
||||
root_folder: doc
|
||||
.get("root_folder")
|
||||
.ok_or_else(|| miette::miette!("\"root_folder\" configuration value not found"))
|
||||
.and_then(|val| {
|
||||
val.get(0)
|
||||
.and_then(|v| v.as_string().map(Into::into))
|
||||
.ok_or_else(|| {
|
||||
miette::diagnostic!(
|
||||
labels = vec![LabeledSpan::new_primary_with_span(None, val.span())],
|
||||
"root_folder is expected to be a path"
|
||||
)
|
||||
.into()
|
||||
})
|
||||
.map_err(|e: miette::Report| e.with_source_code(data))
|
||||
})?,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
use std::collections::BTreeMap;
|
||||
use std::collections::HashMap;
|
||||
|
||||
use camino::Utf8Path;
|
||||
use camino::Utf8PathBuf;
|
||||
use futures::StreamExt;
|
||||
use futures::TryStreamExt;
|
||||
|
|
@ -123,7 +124,7 @@ pub(crate) fn parse_record(
|
|||
}
|
||||
|
||||
pub(crate) async fn load_records(
|
||||
path: Utf8PathBuf,
|
||||
path: &Utf8Path,
|
||||
definitions: &BTreeMap<String, Vec<Definition>>,
|
||||
) -> miette::Result<Vec<Record>> {
|
||||
let defs = ReadDirStream::new(tokio::fs::read_dir(path).await.into_diagnostic()?)
|
||||
|
|
@ -313,7 +314,7 @@ pub(crate) fn parse_definition(bytes: &str) -> miette::Result<Vec<Definition>> {
|
|||
}
|
||||
|
||||
pub(crate) async fn load_definitions(
|
||||
path: Utf8PathBuf,
|
||||
path: &Utf8Path,
|
||||
) -> miette::Result<BTreeMap<String, Vec<Definition>>> {
|
||||
let defs = ReadDirStream::new(tokio::fs::read_dir(path).await.into_diagnostic()?)
|
||||
.map_err(miette::Report::from_err)
|
||||
|
|
|
|||
1
plaixt.kdl
Normal file
1
plaixt.kdl
Normal file
|
|
@ -0,0 +1 @@
|
|||
root_folder "./examples/"
|
||||
Loading…
Add table
Add a link
Reference in a new issue