From 28287a63031ec44fdda0eea99d757a7047df5a41 Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Mon, 5 Oct 2020 17:20:48 +0100 Subject: feat: use directories project data dir chore: clean up some things --- Cargo.lock | 10 +++++++ Cargo.toml | 1 + src/local/database.rs | 46 +++++++++++++++-------------- src/local/history.rs | 6 ++-- src/local/mod.rs | 2 +- src/main.rs | 80 ++++++++++++++++++++++++++++++++------------------- 6 files changed, 90 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07527f70..38f9cd77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,6 +121,15 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "directories" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs" version = "2.0.2" @@ -438,6 +447,7 @@ name = "shync" version = "0.1.0" dependencies = [ "chrono", + "directories", "eyre", "log", "pretty_env_logger", diff --git a/Cargo.toml b/Cargo.toml index f91f12cd..6c32eec5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,4 @@ eyre = "0.6.1" shellexpand = "2.0.0" rusqlite = "0.24.0" structopt = "0.3.15" +directories = "3.0.1" diff --git a/src/local/database.rs b/src/local/database.rs index b84bf99c..b94a6445 100644 --- a/src/local/database.rs +++ b/src/local/database.rs @@ -1,12 +1,11 @@ use std::path::Path; use eyre::Result; -use shellexpand; -use rusqlite::{params, Connection}; use rusqlite::NO_PARAMS; +use rusqlite::{params, Connection}; -use super::history::History; +use crate::History; pub trait Database { fn save(&self, h: History) -> Result<()>; @@ -19,23 +18,25 @@ pub struct SqliteDatabase { conn: Connection, } -impl SqliteDatabase{ - pub fn new(path: &str) -> Result { - let path = shellexpand::full(path)?; +impl SqliteDatabase { + pub fn new(path: impl AsRef) -> Result { let path = path.as_ref(); - debug!("opening sqlite database at {:?}", path); - let create = !Path::new(path).exists(); + let create = !path.exists(); + if create { + if let Some(dir) = path.parent() { + std::fs::create_dir_all(dir)?; + } + } + let conn = Connection::open(path)?; if create { Self::setup_db(&conn)?; } - Ok(SqliteDatabase{ - conn: conn, - }) + Ok(SqliteDatabase { conn }) } fn setup_db(conn: &Connection) -> Result<()> { @@ -43,11 +44,11 @@ impl SqliteDatabase{ conn.execute( "create table if not exists history ( - id integer primary key, - timestamp integer not null, - command text not null, - cwd text not null - )", + id integer primary key, + timestamp integer not null, + command text not null, + cwd text not null + )", NO_PARAMS, )?; @@ -61,19 +62,22 @@ impl Database for SqliteDatabase { self.conn.execute( "insert into history ( - timestamp, + timestamp, command, cwd - ) values (?1, ?2, ?3)", - params![h.timestamp, h.command, h.cwd])?; + ) values (?1, ?2, ?3)", + params![h.timestamp, h.command, h.cwd], + )?; Ok(()) } fn list(&self) -> Result<()> { debug!("listing history"); - - let mut stmt = self.conn.prepare("SELECT timestamp, command, cwd FROM history")?; + + let mut stmt = self + .conn + .prepare("SELECT timestamp, command, cwd FROM history")?; let history_iter = stmt.query_map(params![], |row| { Ok(History { timestamp: row.get(0)?, diff --git a/src/local/history.rs b/src/local/history.rs index 61438b6d..e84d718c 100644 --- a/src/local/history.rs +++ b/src/local/history.rs @@ -8,11 +8,11 @@ pub struct History { } impl History { - pub fn new(command: &str, cwd: &str) -> History { + pub fn new(command: String, cwd: String) -> History { History { timestamp: chrono::Utc::now().timestamp_millis(), - command: command.to_string(), - cwd: cwd.to_string(), + command, + cwd, } } } diff --git a/src/local/mod.rs b/src/local/mod.rs index 8854aa8e..f587d016 100644 --- a/src/local/mod.rs +++ b/src/local/mod.rs @@ -1,2 +1,2 @@ -pub mod history; pub mod database; +pub mod history; diff --git a/src/main.rs b/src/main.rs index 769c3235..f080a924 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,45 +1,72 @@ use std::env; +use std::path::PathBuf; +use directories::ProjectDirs; +use eyre::{eyre, Result}; use structopt::StructOpt; -use eyre::Result; -#[macro_use] extern crate log; +#[macro_use] +extern crate log; use pretty_env_logger; mod local; -use local::history::History; use local::database::{Database, SqliteDatabase}; +use local::history::History; #[derive(StructOpt)] #[structopt( - author="Ellie Huxtable ", - version="0.1.0", - about="Keep your shell history in sync" + author = "Ellie Huxtable ", + version = "0.1.0", + about = "Keep your shell history in sync" )] -enum Shync { +struct Shync { + #[structopt(long, parse(from_os_str), about = "db file path")] + db: Option, + + #[structopt(subcommand)] + shync: ShyncCmd, +} + +#[derive(StructOpt)] +enum ShyncCmd { #[structopt( about="manipulate shell history", aliases=&["h", "hi", "his", "hist", "histo", "histor"], )] History(HistoryCmd), - #[structopt( - about="import shell history from file", - )] + #[structopt(about = "import shell history from file")] Import, - #[structopt( - about="start a shync server", - )] + #[structopt(about = "start a shync server")] Server, } impl Shync { - fn run(self, db: SqliteDatabase) -> Result<()> { - match self { - Shync::History(history) => history.run(db), - _ => Ok(()) + fn run(self) -> Result<()> { + let db_path = match self.db { + Some(db_path) => { + let path = db_path + .to_str() + .ok_or(eyre!("path {:?} was not valid UTF-8", db_path))?; + let path = shellexpand::full(path)?; + PathBuf::from(path.as_ref()) + } + None => { + let project_dirs = ProjectDirs::from("bike", "ellie", "shync").ok_or(eyre!( + "could not determine db file location\nspecify one using the --db flag" + ))?; + let root = project_dirs.data_dir(); + root.join("history.db") + } + }; + + let db = SqliteDatabase::new(db_path)?; + + match self.shync { + ShyncCmd::History(history) => history.run(db), + _ => Ok(()), } } } @@ -50,9 +77,7 @@ enum HistoryCmd { about="add a new command to the history", aliases=&["a", "ad"], )] - Add { - command: Vec, - }, + Add { command: Vec }, #[structopt( about="list all items in history", @@ -64,14 +89,10 @@ enum HistoryCmd { impl HistoryCmd { fn run(self, db: SqliteDatabase) -> Result<()> { match self { - HistoryCmd::Add{command: words} => { + HistoryCmd::Add { command: words } => { let command = words.join(" "); - - let cwd = env::current_dir()?; - let h = History::new( - command.as_str(), - cwd.display().to_string().as_str(), - ); + let cwd = env::current_dir()?.display().to_string(); + let h = History::new(command, cwd); debug!("adding history: {:?}", h); db.save(h)?; @@ -79,7 +100,7 @@ impl HistoryCmd { Ok(()) } - HistoryCmd::List => db.list() + HistoryCmd::List => db.list(), } } } @@ -87,6 +108,5 @@ impl HistoryCmd { fn main() -> Result<()> { pretty_env_logger::init(); - let db = SqliteDatabase::new("~/.history.db")?; - Shync::from_args().run(db) + Shync::from_args().run() } -- cgit v1.2.3 From 7dd2d02238fc6104f56ac8cd38b63a5a82be1bae Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Mon, 5 Oct 2020 17:34:28 +0100 Subject: fix: help text --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index f080a924..2ec14a50 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,7 +21,7 @@ use local::history::History; about = "Keep your shell history in sync" )] struct Shync { - #[structopt(long, parse(from_os_str), about = "db file path")] + #[structopt(long, parse(from_os_str), help = "db file path")] db: Option, #[structopt(subcommand)] -- cgit v1.2.3