1 files changed, 62 insertions, 9 deletions

diff --git a/src/local/database.rs b/src/local/database.rs
index b94a6445..b2c009b6 100644
--- a/src/local/database.rs
+++ b/src/local/database.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use eyre::Result;
+use eyre::{eyre, Result};
 
 use rusqlite::NO_PARAMS;
 use rusqlite::{params, Connection};
@@ -9,7 +9,9 @@ use crate::History;
 
 pub trait Database {
     fn save(&self, h: History) -> Result<()>;
+    fn load(&self, id: &str) -> Result<History>;
     fn list(&self) -> Result<()>;
+    fn update(&self, h: History) -> Result<()>;
 }
 
 // Intended for use on a developer machine and not a sync server.
@@ -44,8 +46,10 @@ impl SqliteDatabase {
 
         conn.execute(
             "create table if not exists history (
-                id integer primary key,
+                id text primary key,
                 timestamp integer not null,
+                duration integer not null,
+                exit integer not null,
                 command text not null,
                 cwd text not null
             )",
@@ -62,11 +66,53 @@ impl Database for SqliteDatabase {
 
         self.conn.execute(
             "insert into history (
+                id,
                 timestamp,
+                duration,
+                exit,
                 command,
                 cwd
-            ) values (?1, ?2, ?3)",
-            params![h.timestamp, h.command, h.cwd],
+            ) values (?1, ?2, ?3, ?4, ?5, ?6)",
+            params![h.id, h.timestamp, h.duration, h.exit, h.command, h.cwd],
+        )?;
+
+        Ok(())
+    }
+
+    fn load(&self, id: &str) -> Result<History> {
+        debug!("loading history item");
+
+        let mut stmt = self.conn.prepare(
+            "select id, timestamp, duration, exit, command, cwd from history
+                where id = ?1",
+        )?;
+
+        let iter = stmt.query_map(params![id], |row| {
+            Ok(History {
+                id: String::from(id),
+                timestamp: row.get(1)?,
+                duration: row.get(2)?,
+                exit: row.get(3)?,
+                command: row.get(4)?,
+                cwd: row.get(5)?,
+            })
+        })?;
+
+        for i in iter {
+            return Ok(i.unwrap());
+        }
+
+        return Err(eyre!("Failed to fetch history: {}", id));
+    }
+
+    fn update(&self, h: History) -> Result<()> {
+        debug!("updating sqlite history");
+
+        self.conn.execute(
+            "update history
+                set timestamp = ?2, duration = ?3, exit = ?4, command = ?5, cwd = ?6
+                where id = ?1",
+            params![h.id, h.timestamp, h.duration, h.exit, h.command, h.cwd],
         )?;
 
         Ok(())
@@ -77,19 +123,26 @@ impl Database for SqliteDatabase {
 
         let mut stmt = self
             .conn
-            .prepare("SELECT timestamp, command, cwd FROM history")?;
+            .prepare("SELECT id, timestamp, duration, exit, command, cwd FROM history")?;
+
         let history_iter = stmt.query_map(params![], |row| {
             Ok(History {
-                timestamp: row.get(0)?,
-                command: row.get(1)?,
-                cwd: row.get(2)?,
+                id: row.get(0)?,
+                timestamp: row.get(1)?,
+                duration: row.get(2)?,
+                exit: row.get(3)?,
+                command: row.get(4)?,
+                cwd: row.get(5)?,
             })
         })?;
 
         for h in history_iter {
             let h = h.unwrap();
 
-            println!("{}:{}:{}", h.timestamp, h.cwd, h.command);
+            println!(
+                "{} | {} | {} | {} | {}",
+                h.timestamp, h.cwd, h.duration, h.exit, h.command
+            );
         }
 
         Ok(())