summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-11-07 22:42:45 -0500
committerJesse Luehrs <doy@tozt.net>2018-11-07 22:42:45 -0500
commit82b4111b7be32b8cd0082a91224aafd53bc2677f (patch)
treebc28d9f0d654e2c9e73c30713402451c5e80d17f
parentd022e0304ffb61ac32891bc097be4abf11025a92 (diff)
downloadlastfm-query-82b4111b7be32b8cd0082a91224aafd53bc2677f.tar.gz
lastfm-query-82b4111b7be32b8cd0082a91224aafd53bc2677f.zip
clean up one more use of expect
-rw-r--r--src/cmd/sync.rs2
-rw-r--r--src/paths.rs8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/sync.rs b/src/cmd/sync.rs
index 985b221..00fd35d 100644
--- a/src/cmd/sync.rs
+++ b/src/cmd/sync.rs
@@ -6,7 +6,7 @@ use paths;
use failure;
pub fn run(opts: &cli::Options) -> failure::Fallible<()> {
- let db = db::DB::new(&paths::dbpath())?;
+ let db = db::DB::new(&paths::dbpath()?)?;
let lastfm = lastfm::LastFMClient::new(
opts.api_key.as_ref().unwrap(),
opts.username.as_ref().unwrap()
diff --git a/src/paths.rs b/src/paths.rs
index 2322cea..b412045 100644
--- a/src/paths.rs
+++ b/src/paths.rs
@@ -1,8 +1,8 @@
use directories::ProjectDirs;
-pub fn dbpath() -> std::path::PathBuf {
- ProjectDirs::from("", "", "lastfm-query")
- .expect("coudln't determine data directory")
+pub fn dbpath() -> failure::Fallible<std::path::PathBuf> {
+ Ok(ProjectDirs::from("", "", "lastfm-query")
+ .ok_or_else(|| failure::err_msg("couldn't determine data directory"))?
.data_dir()
- .join("tracks.sqlite")
+ .join("tracks.sqlite"))
}