diff options
-rw-r--r-- | src/cmd/sql.rs | 4 | ||||
-rw-r--r-- | src/cmd/sync.rs | 4 | ||||
-rw-r--r-- | src/lastfm/mod.rs | 4 | ||||
-rw-r--r-- | src/main.rs | 18 | ||||
-rw-r--r-- | src/util.rs (renamed from src/paths.rs) | 12 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/cmd/sql.rs b/src/cmd/sql.rs index d31f326..8332164 100644 --- a/src/cmd/sql.rs +++ b/src/cmd/sql.rs @@ -1,5 +1,5 @@ use db; -use paths; +use util; use clap; @@ -34,7 +34,7 @@ impl Command { impl super::Command for Command { fn run(&self) -> failure::Fallible<()> { - let db = db::DB::new(&paths::db_path()?)?; + let db = db::DB::new(&util::db_path()?)?; let rows_cell = std::cell::Cell::new(Some(vec![])); let cols = db.query(&self.query, |row| { diff --git a/src/cmd/sync.rs b/src/cmd/sync.rs index 5b71954..99e39f7 100644 --- a/src/cmd/sync.rs +++ b/src/cmd/sync.rs @@ -1,6 +1,6 @@ use db; use lastfm; -use paths; +use util; use clap; @@ -28,7 +28,7 @@ impl Command { impl super::Command for Command { fn run(&self) -> failure::Fallible<()> { - let db = db::DB::new(&paths::db_path()?)?; + let db = db::DB::new(&util::db_path()?)?; let lastfm = lastfm::LastFMClient::new(&self.username)?; let from = db.most_recent_timestamp()?.map(|x| x + 1); diff --git a/src/lastfm/mod.rs b/src/lastfm/mod.rs index b5888cc..081038a 100644 --- a/src/lastfm/mod.rs +++ b/src/lastfm/mod.rs @@ -1,4 +1,4 @@ -use paths; +use util; use failure::Fail; use std::io::{Read, Write}; @@ -158,7 +158,7 @@ impl LastFMClient { } fn find_api_key() -> failure::Fallible<String> { - let api_key_path = paths::api_key_path() + let api_key_path = util::api_key_path() .map_err(|e| e.context("failed to determine api key path"))?; let api_key = if api_key_path.exists() { let mut api_key = String::new(); diff --git a/src/main.rs b/src/main.rs index d7adc8f..4f9ce07 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,27 +13,15 @@ extern crate serde_json; extern crate serde_derive; mod cmd; -mod lastfm; -mod paths; mod db; - -fn program_name() -> failure::Fallible<String> { - let program = std::env::args() - .next() - .ok_or_else(|| format_err!("no program name found"))?; - let path = std::path::Path::new(&program); - let filename = path.file_name() - .ok_or_else(|| format_err!("invalid filename found"))? - .to_string_lossy() - .to_string(); - Ok(filename) -} +mod lastfm; +mod util; fn main() { match cmd::run() { Ok(_) => {}, Err(e) => { - let name = program_name() + let name = util::program_name() .unwrap_or_else(|e| { eprintln!("{}", e); "?".to_string() diff --git a/src/paths.rs b/src/util.rs index badb783..3e95981 100644 --- a/src/paths.rs +++ b/src/util.rs @@ -1,3 +1,15 @@ +pub fn program_name() -> failure::Fallible<String> { + let program = std::env::args() + .next() + .ok_or_else(|| format_err!("no program name found"))?; + let path = std::path::Path::new(&program); + let filename = path.file_name() + .ok_or_else(|| format_err!("invalid filename found"))? + .to_string_lossy() + .to_string(); + Ok(filename) +} + pub fn db_path() -> failure::Fallible<std::path::PathBuf> { Ok(directories::ProjectDirs::from("", "", "lastfm-query") .ok_or_else(|| failure::err_msg("couldn't determine data directory"))? |