aboutsummaryrefslogtreecommitdiffstats
path: root/crates/turtle/src/atuin_daemon/components
diff options
context:
space:
mode:
Diffstat (limited to 'crates/turtle/src/atuin_daemon/components')
-rw-r--r--crates/turtle/src/atuin_daemon/components/history.rs1
-rw-r--r--crates/turtle/src/atuin_daemon/components/search.rs10
-rw-r--r--crates/turtle/src/atuin_daemon/components/sync.rs4
3 files changed, 2 insertions, 13 deletions
diff --git a/crates/turtle/src/atuin_daemon/components/history.rs b/crates/turtle/src/atuin_daemon/components/history.rs
index ec41977f..b71543c1 100644
--- a/crates/turtle/src/atuin_daemon/components/history.rs
+++ b/crates/turtle/src/atuin_daemon/components/history.rs
@@ -5,7 +5,6 @@
use std::{pin::Pin, sync::Arc};
use crate::atuin_client::{
- database::Database,
history::{History, HistoryId, store::HistoryStore},
settings::Settings,
};
diff --git a/crates/turtle/src/atuin_daemon/components/search.rs b/crates/turtle/src/atuin_daemon/components/search.rs
index 17decdad..832d05d8 100644
--- a/crates/turtle/src/atuin_daemon/components/search.rs
+++ b/crates/turtle/src/atuin_daemon/components/search.rs
@@ -5,7 +5,6 @@
use std::{pin::Pin, sync::Arc};
-use crate::atuin_client::database::Database;
use eyre::Result;
use tokio::sync::RwLock;
use tokio_stream::Stream;
@@ -394,15 +393,6 @@ fn convert_filter_mode(
}
}
-#[cfg(windows)]
-pub(crate) fn with_trailing_slash(s: &str) -> String {
- if s.ends_with('\\') {
- s.to_string()
- } else {
- format!("{}\\", s)
- }
-}
-
#[cfg(not(windows))]
pub(crate) fn with_trailing_slash(s: &str) -> String {
if s.ends_with('/') {
diff --git a/crates/turtle/src/atuin_daemon/components/sync.rs b/crates/turtle/src/atuin_daemon/components/sync.rs
index fdd00b5f..fbfbbd67 100644
--- a/crates/turtle/src/atuin_daemon/components/sync.rs
+++ b/crates/turtle/src/atuin_daemon/components/sync.rs
@@ -141,7 +141,7 @@ async fn sync_loop(handle: DaemonHandle, mut cmd_rx: mpsc::Receiver<SyncCommand>
// Skip periodic ticks if auto_sync is disabled AND we're not retrying
// a previous failure. Retries must continue regardless of auto_sync.
- if !settings.auto_sync && sync_state == SyncState::Idle {
+ if !settings.sync.auto && sync_state == SyncState::Idle {
tracing::debug!("auto_sync disabled, skipping periodic sync tick");
continue;
}
@@ -190,7 +190,7 @@ async fn do_sync_tick(
tracing::info!("sync tick");
// Check if logged in
- let logged_in = match settings.have_sync_key().await {
+ let logged_in = match settings.sync.have_sync_user() {
Ok(v) => v,
Err(e) => {
tracing::warn!("failed to check login status, skipping sync tick: {e}");