|
|
|
@ -4,9 +4,10 @@ use rusqlite::{params, Connection};
|
|
|
|
|
use rustc_serialize::base64;
|
|
|
|
|
use rustc_serialize::base64::{FromBase64, ToBase64};
|
|
|
|
|
use std::error::Error;
|
|
|
|
|
use std::fmt;
|
|
|
|
|
use std::path::PathBuf;
|
|
|
|
|
|
|
|
|
|
static DB_INIT_QUERY: &'static str = include_str!("init.sql");
|
|
|
|
|
static DB_INIT_QUERY: &str = include_str!("init.sql");
|
|
|
|
|
|
|
|
|
|
pub struct DbHandle {
|
|
|
|
|
conn: Connection,
|
|
|
|
@ -23,6 +24,11 @@ pub struct DbNamespace {
|
|
|
|
|
pub name: EncryptedValue,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct Namespace {
|
|
|
|
|
pub id: i64,
|
|
|
|
|
pub name: String,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct DbNote {
|
|
|
|
|
pub id: i64,
|
|
|
|
|
pub namespace: DbNamespace,
|
|
|
|
@ -44,13 +50,13 @@ impl DbHandle {
|
|
|
|
|
pub fn new(db_path: &Option<String>) -> DbHandle {
|
|
|
|
|
let path: PathBuf = db_path
|
|
|
|
|
.as_ref()
|
|
|
|
|
.map(|path: &String| PathBuf::from(path))
|
|
|
|
|
.map(PathBuf::from)
|
|
|
|
|
.unwrap_or_else(|| dirs::home_dir().unwrap().join(".foil").to_path_buf());
|
|
|
|
|
let mut conn: Connection = Connection::open(path).unwrap();
|
|
|
|
|
let tx = conn.transaction().unwrap();
|
|
|
|
|
tx.execute_batch(DB_INIT_QUERY).unwrap();
|
|
|
|
|
tx.commit().unwrap();
|
|
|
|
|
DbHandle { conn: conn }
|
|
|
|
|
DbHandle { conn }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn get_namespace_id(
|
|
|
|
@ -87,7 +93,7 @@ impl DbHandle {
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
let rowid: i64 = tx.last_insert_rowid();
|
|
|
|
|
let _ = tx.commit().unwrap();
|
|
|
|
|
tx.commit().unwrap();
|
|
|
|
|
Ok(rowid)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -119,7 +125,7 @@ impl DbHandle {
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let _ = tx.commit().unwrap();
|
|
|
|
|
tx.commit().unwrap();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn read_notes(&mut self, master_key: [u8; 32]) -> rusqlite::Result<Vec<Note>> {
|
|
|
|
@ -146,13 +152,37 @@ impl DbHandle {
|
|
|
|
|
title: note.title.decrypt_to_string(master_key).unwrap(),
|
|
|
|
|
value: note.value.decrypt_to_string(master_key).unwrap(),
|
|
|
|
|
}),
|
|
|
|
|
Err(e) => return Err(e),
|
|
|
|
|
Err(e) => Err(e),
|
|
|
|
|
})
|
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
|
|
notes
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn list_namespaces(&mut self, master_key: [u8; 32]) -> rusqlite::Result<Vec<Namespace>> {
|
|
|
|
|
let mut stmt = self
|
|
|
|
|
.conn
|
|
|
|
|
.prepare("SELECT id, name FROM namespaces")
|
|
|
|
|
.unwrap();
|
|
|
|
|
let rows = stmt.query_map(params![], |row| {
|
|
|
|
|
Ok(DbNamespace {
|
|
|
|
|
id: row.get(0)?,
|
|
|
|
|
name: row.get(1)?,
|
|
|
|
|
})
|
|
|
|
|
})?;
|
|
|
|
|
|
|
|
|
|
let namespaces: Result<Vec<Namespace>, _> = rows
|
|
|
|
|
.map(|namespace_result| match namespace_result {
|
|
|
|
|
Ok(namespace) => Ok(Namespace {
|
|
|
|
|
id: namespace.id,
|
|
|
|
|
name: namespace.name.decrypt_to_string(master_key).unwrap(),
|
|
|
|
|
}),
|
|
|
|
|
Err(e) => Err(e),
|
|
|
|
|
})
|
|
|
|
|
.collect();
|
|
|
|
|
namespaces
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn get_db_property(&self, name: &str) -> Result<Option<String>, Box<dyn Error>> {
|
|
|
|
|
let mut stmt = self
|
|
|
|
|
.conn
|
|
|
|
@ -185,8 +215,14 @@ impl DbHandle {
|
|
|
|
|
.map(|option| option.map(|prop| prop.from_base64().unwrap()))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn set_db_property_bytes(&self, name: &str, value: &Vec<u8>) {
|
|
|
|
|
pub fn set_db_property_bytes(&self, name: &str, value: &[u8]) {
|
|
|
|
|
let b64value: String = value.to_base64(base64::STANDARD);
|
|
|
|
|
self.set_db_property(name, &b64value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for Namespace {
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
|
|
|
write!(f, "{}", self.name)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|