Private
Public Access
1
0

devises a strategy for signals

This commit is contained in:
2025-04-27 22:44:05 -07:00
parent cecfd7cd76
commit 1e9b570993
7 changed files with 91 additions and 8 deletions

View File

@@ -4,6 +4,9 @@ use settings::Settings;
pub mod events;
use events::*;
pub mod signals;
use signals::*;
use anyhow::Result;
use directories::ProjectDirs;
use std::error::Error;
@@ -57,6 +60,10 @@ mod target {
pub struct Daemon {
pub event_sender: Sender<Event>,
event_receiver: Receiver<Event>,
signal_receiver: Option<Receiver<Signal>>,
signal_sender: Sender<Signal>,
version: String,
database: Arc<Mutex<Database>>,
runtime: tokio::runtime::Runtime,
@@ -73,7 +80,7 @@ impl Daemon {
// Create event channels
let (event_sender, event_receiver) = tokio::sync::mpsc::channel(100);
let (signal_sender, signal_receiver) = tokio::sync::mpsc::channel(100);
// Create background task runtime
let runtime = tokio::runtime::Builder::new_multi_thread()
.enable_all()
@@ -82,7 +89,15 @@ impl Daemon {
let database_impl = Database::new(&database_path.to_string_lossy())?;
let database = Arc::new(Mutex::new(database_impl));
Ok(Self { version: "0.1.0".to_string(), database, event_receiver, event_sender, runtime })
Ok(Self {
version: "0.1.0".to_string(),
database,
event_receiver,
event_sender,
signal_receiver: Some(signal_receiver),
signal_sender,
runtime
})
}
pub async fn run(&mut self) {
@@ -99,8 +114,9 @@ impl Daemon {
Event::SyncAllConversations(reply) => {
let db_clone = self.database.clone();
let signal_sender = self.signal_sender.clone();
self.runtime.spawn(async move {
let result = Self::sync_all_conversations_impl(db_clone).await;
let result = Self::sync_all_conversations_impl(db_clone, signal_sender).await;
if let Err(e) = result {
log::error!("Error handling sync event: {}", e);
}
@@ -136,11 +152,16 @@ impl Daemon {
}
}
/// Panics if the signal receiver has already been taken.
pub fn obtain_signal_receiver(&mut self) -> Receiver<Signal> {
self.signal_receiver.take().unwrap()
}
async fn get_conversations(&mut self) -> Vec<Conversation> {
self.database.lock().await.with_repository(|r| r.all_conversations().unwrap()).await
}
async fn sync_all_conversations_impl(mut database: Arc<Mutex<Database>>) -> Result<()> {
async fn sync_all_conversations_impl(mut database: Arc<Mutex<Database>>, signal_sender: Sender<Signal>) -> Result<()> {
log::info!(target: target::SYNC, "Starting conversation sync");
let mut client = Self::get_client_impl(database.clone()).await?;
@@ -171,6 +192,9 @@ impl Daemon {
database.with_repository(|r| r.insert_messages(&conversation_id, db_messages)).await?;
}
// Send conversations updated signal.
signal_sender.send(Signal::ConversationsUpdated).await?;
log::info!(target: target::SYNC, "Synchronized {} conversations", num_conversations);
Ok(())
}