Use cargo workspaces (#37)

* Switch to Cargo workspaces

Breaking things into "client", "server" and "common" makes managing the
codebase much easier!

client - anything running on a user's machine for adding history
server - handles storing/syncing history and running a HTTP server
common - request/response API definitions, common utils, etc

* Update dockerfile

8 files changed, 43 insertions, 57 deletions

diff --git a/src/local/api_client.rs b/atuin-client/src/api_client.rs
index 1b64a295..db2802c3 100644
--- a/src/local/api_client.rs
+++ b/atuin-client/src/api_client.rs
@@ -4,10 +4,11 @@ use reqwest::header::{HeaderMap, AUTHORIZATION};
 use reqwest::Url;
 use sodiumoxide::crypto::secretbox;
 
-use crate::api::{AddHistoryRequest, CountResponse, SyncHistoryResponse};
-use crate::local::encryption::decrypt;
-use crate::local::history::History;
-use crate::utils::hash_str;
+use atuin_common::api::{AddHistoryRequest, CountResponse, SyncHistoryResponse};
+use atuin_common::utils::hash_str;
+
+use crate::encryption::decrypt;
+use crate::history::History;
 
 pub struct Client<'a> {
     sync_addr: &'a str,
diff --git a/src/local/database.rs b/atuin-client/src/database.rs
index abc22bb8..abc22bb8 100644
--- a/src/local/database.rs
+++ b/atuin-client/src/database.rs
diff --git a/src/local/encryption.rs b/atuin-client/src/encryption.rs
index 3c1699e3..37153f94 100644
--- a/src/local/encryption.rs
+++ b/atuin-client/src/encryption.rs
@@ -15,7 +15,7 @@ use std::path::PathBuf;
 use eyre::{eyre, Result};
 use sodiumoxide::crypto::secretbox;
 
-use crate::local::history::History;
+use crate::history::History;
 use crate::settings::Settings;
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -26,7 +26,7 @@ pub struct EncryptedHistory {
 
 // Loads the secret key, will create + save if it doesn't exist
 pub fn load_key(settings: &Settings) -> Result<secretbox::Key> {
-    let path = settings.local.key_path.as_str();
+    let path = settings.key_path.as_str();
 
     if PathBuf::from(path).exists() {
         let bytes = std::fs::read(path)?;
diff --git a/src/local/history.rs b/atuin-client/src/history.rs
index 1712f8b9..7f607784 100644
--- a/src/local/history.rs
+++ b/atuin-client/src/history.rs
@@ -3,7 +3,7 @@ use std::hash::{Hash, Hasher};
 
 use chrono::Utc;
 
-use crate::command::uuid_v4;
+use atuin_common::utils::uuid_v4;
 
 // Any new fields MUST be Optional<>!
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/src/local/import.rs b/atuin-client/src/import.rs
index 3b0b2a69..3b0b2a69 100644
--- a/src/local/import.rs
+++ b/atuin-client/src/import.rs
diff --git a/src/local/mod.rs b/atuin-client/src/lib.rs
index 9fe31292..1207bfdb 100644
--- a/src/local/mod.rs
+++ b/atuin-client/src/lib.rs
@@ -1,6 +1,13 @@
+#[macro_use]
+extern crate log;
+
+#[macro_use]
+extern crate serde_derive;
+
 pub mod api_client;
 pub mod database;
 pub mod encryption;
 pub mod history;
 pub mod import;
+pub mod settings;
 pub mod sync;
diff --git a/src/settings.rs b/atuin-client/src/settings.rs
index 5325610e..e28963c0 100644
--- a/src/settings.rs
+++ b/atuin-client/src/settings.rs
@@ -12,7 +12,7 @@ use parse_duration::parse;
 pub const HISTORY_PAGE_SIZE: i64 = 100;
 
 #[derive(Clone, Debug, Deserialize)]
-pub struct Local {
+pub struct Settings {
     pub dialect: String,
     pub auto_sync: bool,
     pub sync_address: String,
@@ -26,7 +26,7 @@ pub struct Local {
     pub session_token: String,
 }
 
-impl Local {
+impl Settings {
     pub fn save_sync_time() -> Result<()> {
         let sync_time_path = ProjectDirs::from("com", "elliehuxtable", "atuin")
             .ok_or_else(|| eyre!("could not determine key file location"))?;
@@ -66,28 +66,12 @@ impl Local {
         match parse(self.sync_frequency.as_str()) {
             Ok(d) => {
                 let d = chrono::Duration::from_std(d).unwrap();
-                Ok(Utc::now() - Local::last_sync()? >= d)
+                Ok(Utc::now() - Settings::last_sync()? >= d)
             }
             Err(e) => Err(eyre!("failed to check sync: {}", e)),
         }
     }
-}
 
-#[derive(Clone, Debug, Deserialize)]
-pub struct Server {
-    pub host: String,
-    pub port: u16,
-    pub db_uri: String,
-    pub open_registration: bool,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct Settings {
-    pub local: Local,
-    pub server: Server,
-}
-
-impl Settings {
     pub fn new() -> Result<Self> {
         let config_dir = ProjectDirs::from("com", "elliehuxtable", "atuin").unwrap();
         let config_dir = config_dir.config_dir();
@@ -103,8 +87,6 @@ impl Settings {
             config_file
         };
 
-        // create the config file if it does not exist
-
         let mut s = Config::new();
 
         let db_path = ProjectDirs::from("com", "elliehuxtable", "atuin")
@@ -122,18 +104,13 @@ impl Settings {
             .data_dir()
             .join("session");
 
-        s.set_default("local.db_path", db_path.to_str())?;
-        s.set_default("local.key_path", key_path.to_str())?;
-        s.set_default("local.session_path", session_path.to_str())?;
-        s.set_default("local.dialect", "us")?;
-        s.set_default("local.auto_sync", true)?;
-        s.set_default("local.sync_frequency", "5m")?;
-        s.set_default("local.sync_address", "https://api.atuin.sh")?;
-
-        s.set_default("server.host", "127.0.0.1")?;
-        s.set_default("server.port", 8888)?;
-        s.set_default("server.open_registration", false)?;
-        s.set_default("server.db_uri", "default_uri")?;
+        s.set_default("db_path", db_path.to_str())?;
+        s.set_default("key_path", key_path.to_str())?;
+        s.set_default("session_path", session_path.to_str())?;
+        s.set_default("dialect", "us")?;
+        s.set_default("auto_sync", true)?;
+        s.set_default("sync_frequency", "5m")?;
+        s.set_default("sync_address", "https://api.atuin.sh")?;
 
         if config_file.exists() {
             s.merge(ConfigFile::with_name(config_file.to_str().unwrap()))?;
@@ -146,24 +123,24 @@ impl Settings {
         s.merge(Environment::with_prefix("atuin").separator("_"))?;
 
         // all paths should be expanded
-        let db_path = s.get_str("local.db_path")?;
+        let db_path = s.get_str("db_path")?;
         let db_path = shellexpand::full(db_path.as_str())?;
-        s.set("local.db_path", db_path.to_string())?;
+        s.set("db_path", db_path.to_string())?;
 
-        let key_path = s.get_str("local.key_path")?;
+        let key_path = s.get_str("key_path")?;
         let key_path = shellexpand::full(key_path.as_str())?;
-        s.set("local.key_path", key_path.to_string())?;
+        s.set("key_path", key_path.to_string())?;
 
-        let session_path = s.get_str("local.session_path")?;
+        let session_path = s.get_str("session_path")?;
         let session_path = shellexpand::full(session_path.as_str())?;
-        s.set("local.session_path", session_path.to_string())?;
+        s.set("session_path", session_path.to_string())?;
 
         // Finally, set the auth token
         if Path::new(session_path.to_string().as_str()).exists() {
             let token = std::fs::read_to_string(session_path.to_string())?;
-            s.set("local.session_token", token.trim())?;
+            s.set("session_token", token.trim())?;
         } else {
-            s.set("local.session_token", "not logged in")?;
+            s.set("session_token", "not logged in")?;
         }
 
         s.try_into()
diff --git a/src/local/sync.rs b/atuin-client/src/sync.rs
index e0feb759..0ca8d3a6 100644
--- a/src/local/sync.rs
+++ b/atuin-client/src/sync.rs
@@ -3,11 +3,12 @@ use std::convert::TryInto;
 use chrono::prelude::*;
 use eyre::Result;
 
-use crate::local::api_client;
-use crate::local::database::Database;
-use crate::local::encryption::{encrypt, load_key};
-use crate::settings::{Local, Settings, HISTORY_PAGE_SIZE};
-use crate::{api::AddHistoryRequest, utils::hash_str};
+use atuin_common::{api::AddHistoryRequest, utils::hash_str};
+
+use crate::api_client;
+use crate::database::Database;
+use crate::encryption::{encrypt, load_key};
+use crate::settings::{Settings, HISTORY_PAGE_SIZE};
 
 // Currently sync is kinda naive, and basically just pages backwards through
 // history. This means newly added stuff shows up properly! We also just use
@@ -33,7 +34,7 @@ async fn sync_download(
     let mut last_sync = if force {
         Utc.timestamp_millis(0)
     } else {
-        Local::last_sync()?
+        Settings::last_sync()?
     };
 
     let mut last_timestamp = Utc.timestamp_millis(0);
@@ -124,8 +125,8 @@ async fn sync_upload(
 
 pub async fn sync(settings: &Settings, force: bool, db: &mut (impl Database + Send)) -> Result<()> {
     let client = api_client::Client::new(
-        settings.local.sync_address.as_str(),
-        settings.local.session_token.as_str(),
+        settings.sync_address.as_str(),
+        settings.session_token.as_str(),
         load_key(settings)?,
     );
 
@@ -135,7 +136,7 @@ pub async fn sync(settings: &Settings, force: bool, db: &mut (impl Database + Se
 
     debug!("sync downloaded {}", download.0);
 
-    Local::save_sync_time()?;
+    Settings::save_sync_time()?;
 
     Ok(())
 }