From e51fa3abeb7414c9df16ba2acb688f38dc335aeb Mon Sep 17 00:00:00 2001 From: James Magahern Date: Wed, 20 Aug 2025 23:12:31 -0700 Subject: [PATCH] kordophoned becomes a lib --- kordophoned/src/dbus/agent.rs | 2 +- kordophoned/src/lib.rs | 3 +++ kordophoned/src/main.rs | 4 +--- kordophoned/src/xpc/agent.rs | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 kordophoned/src/lib.rs diff --git a/kordophoned/src/dbus/agent.rs b/kordophoned/src/dbus/agent.rs index 6cce37a..d284132 100644 --- a/kordophoned/src/dbus/agent.rs +++ b/kordophoned/src/dbus/agent.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use std::{future::Future, thread}; use tokio::sync::{mpsc, oneshot, Mutex}; -use crate::daemon::{ +use kordophoned::daemon::{ contact_resolver::{ContactResolver, DefaultContactResolverBackend}, events::{Event, Reply}, settings::Settings, diff --git a/kordophoned/src/lib.rs b/kordophoned/src/lib.rs new file mode 100644 index 0000000..3c76722 --- /dev/null +++ b/kordophoned/src/lib.rs @@ -0,0 +1,3 @@ +pub mod daemon; + + diff --git a/kordophoned/src/main.rs b/kordophoned/src/main.rs index d56c824..bf2e037 100644 --- a/kordophoned/src/main.rs +++ b/kordophoned/src/main.rs @@ -1,5 +1,3 @@ -mod daemon; - #[cfg(target_os = "linux")] mod dbus; @@ -9,7 +7,7 @@ mod xpc; use log::LevelFilter; use std::future; -use daemon::Daemon; +use kordophoned::daemon::Daemon; fn initialize_logging() { // Weird: is this the best way to do this? diff --git a/kordophoned/src/xpc/agent.rs b/kordophoned/src/xpc/agent.rs index 6090bfc..3a1209d 100644 --- a/kordophoned/src/xpc/agent.rs +++ b/kordophoned/src/xpc/agent.rs @@ -1,4 +1,4 @@ -use crate::daemon::{events::Event, signals::Signal, DaemonResult}; +use kordophoned::daemon::{events::Event, signals::Signal, DaemonResult}; use crate::xpc::interface::SERVICE_NAME; use futures_util::StreamExt; use std::collections::HashMap; @@ -58,7 +58,7 @@ impl XpcAgent { /// Send an event to the daemon and await its reply. pub async fn send_event( &self, - make_event: impl FnOnce(crate::daemon::events::Reply) -> Event, + make_event: impl FnOnce(kordophoned::daemon::events::Reply) -> Event, ) -> DaemonResult { let (tx, rx) = oneshot::channel(); self.event_sink