Skip to content

Commit

Permalink
Merge pull request #364 from hannobraun/config
Browse files Browse the repository at this point in the history
Make configuration optional
  • Loading branch information
hannobraun authored Mar 16, 2022
2 parents 625ae70 + 7a6d8e2 commit 1aa0981
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathBuf>,
pub default_model: Option<PathBuf>,
}

impl Config {
Expand Down
15 changes: 13 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)?;

Expand Down

0 comments on commit 1aa0981

Please sign in to comment.