diff --git a/src/config.rs b/src/config.rs index 8fecef0b0..94d6e8967 100644 --- a/src/config.rs +++ b/src/config.rs @@ -9,8 +9,8 @@ use serde::Deserialize; #[derive(Debug, Deserialize)] pub struct Config { - pub default_path: PathBuf, - pub default_model: PathBuf, + pub default_path: Option, + pub default_model: Option, } impl Config { diff --git a/src/main.rs b/src/main.rs index a2c8b65c8..384404ae3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,6 +12,7 @@ mod window; use std::collections::HashSet; use std::ffi::OsStr; +use std::path::PathBuf; use std::{collections::HashMap, sync::mpsc, time::Instant}; use futures::executor::block_on; @@ -54,8 +55,18 @@ fn main() -> anyhow::Result<()> { let args = Args::parse(); let config = Config::load()?; - let mut path = config.default_path; - path.push(args.model.unwrap_or(config.default_model)); + let mut path = config.default_path.unwrap_or_else(|| PathBuf::from("")); + 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)?;