myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: add more eyre contexts (#200)

Browse source 
* chore: add more eyre contexts

* chore: rustfmt
This commit is contained in:
Conrad Ludgate 2021-11-17 11:50:34 +00:00 committed by GitHub
parent 2e59d6a588
commit f539f60ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
atuin-client/src/settings.rs
View file

@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
use chrono::prelude::*; use chrono::prelude::*;
use chrono::Utc; use chrono::Utc;
use config::{Config, Environment, File as ConfigFile}; use config::{Config, Environment, File as ConfigFile};
use eyre::{eyre, Result}; use eyre::{eyre, Context, Result};
use parse_duration::parse; use parse_duration::parse;
pub const HISTORY_PAGE_SIZE: i64 = 100; pub const HISTORY_PAGE_SIZE: i64 = 100;
@ -105,8 +105,10 @@ impl Settings {
let data_dir = atuin_common::utils::data_dir(); let data_dir = atuin_common::utils::data_dir();
create_dir_all(&config_dir)?; create_dir_all(&config_dir)
create_dir_all(&data_dir)?; .wrap_err_with(|| format!("could not create dir {:?}", config_dir))?;
create_dir_all(&data_dir)
.wrap_err_with(|| format!("could not create dir {:?}", data_dir))?;
let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") { let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") {
PathBuf::from(p) PathBuf::from(p)
@ -134,14 +136,17 @@ impl Settings {
s.set_default("search_mode", "prefix")?; s.set_default("search_mode", "prefix")?;
if config_file.exists() { if config_file.exists() {
s.merge(ConfigFile::with_name(config_file.to_str().unwrap()))?; s.merge(ConfigFile::with_name(config_file.to_str().unwrap()))
.wrap_err_with(|| format!("could not load config file {:?}", config_file))?;
} else { } else {
let example_config = include_bytes!("../config.toml"); let example_config = include_bytes!("../config.toml");
let mut file = File::create(config_file)?; let mut file = File::create(config_file).wrap_err("could not create config file")?;
file.write_all(example_config)?; file.write_all(example_config)
.wrap_err("could not write default config file")?;
} }
s.merge(Environment::with_prefix("atuin").separator("_"))?; s.merge(Environment::with_prefix("atuin").separator("_"))
.wrap_err("could not load environment")?;
// all paths should be expanded // all paths should be expanded
let db_path = s.get_str("db_path")?; let db_path = s.get_str("db_path")?;

12
src/command/mod.rs
View file

@ -1,6 +1,6 @@
use std::path::PathBuf; use std::path::PathBuf;
use eyre::Result; use eyre::{Result, WrapErr};
use structopt::StructOpt; use structopt::StructOpt;
use atuin_client::database::Sqlite; use atuin_client::database::Sqlite;
@ -96,8 +96,8 @@ pub enum AtuinCmd {
impl AtuinCmd { impl AtuinCmd {
pub async fn run(self) -> Result<()> { pub async fn run(self) -> Result<()> {
let client_settings = ClientSettings::new()?; let client_settings = ClientSettings::new().wrap_err("could not load client settings")?;
let server_settings = ServerSettings::new()?; let server_settings = ServerSettings::new().wrap_err("could not load server settings")?;
let db_path = PathBuf::from(client_settings.db_path.as_str()); let db_path = PathBuf::from(client_settings.db_path.as_str());
@ -151,8 +151,10 @@ impl AtuinCmd {
register::run(&client_settings, &r.username, &r.email, &r.password) register::run(&client_settings, &r.username, &r.email, &r.password)
} }
Self::Key => { Self::Key => {
let key = atuin_client::encryption::load_key(&client_settings)?; use atuin_client::encryption::{encode_key, load_key};
println!("{}", atuin_client::encryption::encode_key(key)?); let key = load_key(&client_settings).wrap_err("could not load encryption key")?;
let encode = encode_key(key).wrap_err("could not encode encryption key")?;
println!("{}", encode);
Ok(()) Ok(())
} }