rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-02-26 09:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make default_model optional

Browse Source
This commit is contained in:
Hanno Braun 2022-03-16 15:16:24 +01:00
parent a9ce688a2c
commit 7a6d8e2e68
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.rs
View File

@ -10,7 +10,7 @@ use serde::Deserialize;
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub struct Config { pub struct Config {
pub default_path: Option<PathBuf>, pub default_path: Option<PathBuf>,
pub default_model: PathBuf, pub default_model: Option<PathBuf>,
} }
impl Config { impl Config {

12
src/main.rs
View File

@ -56,7 +56,17 @@ fn main() -> anyhow::Result<()> {
let config = Config::load()?; let config = Config::load()?;
let mut path = config.default_path.unwrap_or_else(|| PathBuf::from("")); let mut path = config.default_path.unwrap_or_else(|| PathBuf::from(""));
path.push(args.model.unwrap_or(config.default_model)); match args.model.or(config.default_model) {
Some(model) => {
path.push(model);
}
None => {
anyhow::bail!(
"No model specified, and no default model configured.\n\
Specify a model by passing `--model path/to/model`."
);
}
}
let model = Model::from_path(path)?; let model = Model::from_path(path)?;