diff options
| author | Ellie Huxtable <e@elm.sh> | 2021-04-20 21:53:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 20:53:07 +0000 |
| commit | a21737e2b7f8d1e426726bdd7536033f299d476a (patch) | |
| tree | e940afdff9c145d25d9a2895fd44a77d70719a2e /src/local/encryption.rs | |
| parent | Switch to Warp + SQLx, use async, switch to Rust stable (#36) (diff) | |
| download | atuin-a21737e2b7f8d1e426726bdd7536033f299d476a.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | atuin-client/src/encryption.rs (renamed from src/local/encryption.rs) | 4 |
1 files changed, 2 insertions, 2 deletions
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)?; |