diff options
Diffstat (limited to '')
| -rw-r--r-- | crates/turtle/src/atuin_client/history.rs (renamed from crates/atuin-client/src/history.rs) | 26 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_client/history/builder.rs (renamed from crates/atuin-client/src/history/builder.rs) | 0 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_client/history/store.rs (renamed from crates/atuin-client/src/history/store.rs) | 9 |
3 files changed, 18 insertions, 17 deletions
diff --git a/crates/atuin-client/src/history.rs b/crates/turtle/src/atuin_client/history.rs index aa0d84d5..cef65115 100644 --- a/crates/atuin-client/src/history.rs +++ b/crates/turtle/src/atuin_client/history.rs @@ -5,14 +5,14 @@ use rmp::{Marker, decode::Bytes}; use std::env; use std::fmt::Display; -use atuin_common::record::DecryptedData; -use atuin_common::utils::uuid_v7; +use crate::atuin_common::record::DecryptedData; +use crate::atuin_common::utils::uuid_v7; use eyre::{Result, bail, eyre}; -use crate::secrets::SECRET_PATTERNS_RE; -use crate::settings::Settings; -use crate::utils::get_host_user; +use crate::atuin_client::secrets::SECRET_PATTERNS_RE; +use crate::atuin_client::settings::Settings; +use crate::atuin_client::utils::get_host_user; use time::OffsetDateTime; mod builder; @@ -381,7 +381,7 @@ impl History { /// /// ## Examples /// ``` - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// let history: History = History::import() /// .timestamp(time::OffsetDateTime::now_utc()) @@ -392,7 +392,7 @@ impl History { /// /// If shell history contains more information, it can be added to the builder: /// ``` - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// let history: History = History::import() /// .timestamp(time::OffsetDateTime::now_utc()) @@ -408,7 +408,7 @@ impl History { /// is forced at compile time: /// /// ```compile_fail - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// // this will not compile because timestamp is missing /// let history: History = History::import() @@ -428,7 +428,7 @@ impl History { /// /// ## Examples /// ```rust - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// let history: History = History::capture() /// .timestamp(time::OffsetDateTime::now_utc()) @@ -441,7 +441,7 @@ impl History { /// Command without any required info cannot be captured, which is forced at compile time: /// /// ```compile_fail - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// // this will not compile because `cwd` is missing /// let history: History = History::capture() @@ -466,7 +466,7 @@ impl History { /// /// ## Examples /// ```rust - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// let history: History = History::daemon() /// .timestamp(time::OffsetDateTime::now_utc()) @@ -481,7 +481,7 @@ impl History { /// Command without any required info cannot be captured, which is forced at compile time: /// /// ```compile_fail - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// // this will not compile because `hostname` is missing /// let history: History = History::daemon() @@ -501,7 +501,7 @@ impl History { /// All fields are required, as they are all present in the database. /// /// ```compile_fail - /// use atuin_client::history::History; + /// use crate::atuin_client::history::History; /// /// // this will not compile because `id` field is missing /// let history: History = History::from_db() diff --git a/crates/atuin-client/src/history/builder.rs b/crates/turtle/src/atuin_client/history/builder.rs index 72a505fd..72a505fd 100644 --- a/crates/atuin-client/src/history/builder.rs +++ b/crates/turtle/src/atuin_client/history/builder.rs diff --git a/crates/atuin-client/src/history/store.rs b/crates/turtle/src/atuin_client/history/store.rs index ce7b43a1..66d9db47 100644 --- a/crates/atuin-client/src/history/store.rs +++ b/crates/turtle/src/atuin_client/history/store.rs @@ -3,12 +3,13 @@ use std::{collections::HashSet, fmt::Write, time::Duration}; use eyre::{Result, bail, eyre}; use indicatif::{ProgressBar, ProgressState, ProgressStyle}; use rmp::decode::Bytes; +use tracing::debug; -use crate::{ +use crate::atuin_client::{ database::{Database, current_context}, record::{encryption::PASETO_V4, sqlite_store::SqliteStore, store::Store}, }; -use atuin_common::record::{DecryptedData, Host, HostId, Record, RecordId, RecordIdx}; +use crate::atuin_common::record::{DecryptedData, Host, HostId, Record, RecordId, RecordIdx}; use super::{HISTORY_TAG, HISTORY_VERSION, HISTORY_VERSION_V0, History, HistoryId}; @@ -361,10 +362,10 @@ impl HistoryStore { #[cfg(test)] mod tests { - use atuin_common::record::DecryptedData; + use crate::atuin_common::record::DecryptedData; use time::macros::datetime; - use crate::history::{HISTORY_VERSION, store::HistoryRecord}; + use crate::atuin_client::history::{HISTORY_VERSION, store::HistoryRecord}; use super::History; |
