From 0f0d4477a4eab8ec0b99c134154ce0fedb4d6400 Mon Sep 17 00:00:00 2001
From: "Jakob L. Kreuze" <zerodaysfordays@sdf.org>
Date: Sat, 6 Jun 2020 18:58:52 -0400
Subject: Clean up for release.

---
 src/birka-cli.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/birka-cli.rs')

diff --git a/src/birka-cli.rs b/src/birka-cli.rs
index e74fcd7..3fd5420 100644
--- a/src/birka-cli.rs
+++ b/src/birka-cli.rs
@@ -18,10 +18,12 @@
 #[macro_use]
 extern crate anyhow;
 extern crate dirs;
+#[macro_use]
+extern crate rusqlite;
 
 mod database;
 
-use database::{hash_file, TagDatabase};
+use database::TagDatabase;
 use std::env;
 use std::path::Path;
 
@@ -35,9 +37,9 @@ fn main() {
     let tb = if let Ok(val) = env::var("TB_PATH") {
         TagDatabase::new(&val)
     } else if let Some(dir) = dirs::config_dir() {
-        TagDatabase::new(dir.join("birka.db").to_str().unwrap())
+        TagDatabase::new(&dir.join("birka.db"))
     } else {
-        TagDatabase::new(Path::new("/tmp").join("pometka.db").to_str().unwrap())
+        TagDatabase::new(&Path::new("/tmp").join("birka.db"))
     }
     .unwrap();
 
@@ -49,7 +51,7 @@ fn main() {
                 std::process::exit(1);
             }
             let path = Path::new(&args[2]).canonicalize().unwrap();
-            let hash = hash_file(&path).unwrap();
+            let hash = database::hash_file(&path).unwrap();
             let id = tb.import_image(&path, &hash).unwrap();
             for arg in args[3..].iter() {
                 tb.add_tag(arg).unwrap();
-- 
cgit v1.3