the big cleanup refactor

Author: PandorasFox

src/cli.rs

@@ -1,5 +1,5 @@
 use ::pandora::pithos::config::LogLevel;
-use ::pandora::pithos::commands::{CommandType, DaemonCommand, StopCommand, RenderThreadCommand};
+use ::pandora::pithos::commands::{CommandType, DaemonCommand};
 use clap::{arg, Parser};
 use std::process;
 
@@ -17,7 +17,6 @@ struct Interface {
 #[derive(Clone, clap::Subcommand)]
 enum CliCommand {
     StopDaemon,
-    StopThread(StopCommand),
     Lock,
 }
 
@@ -26,7 +25,6 @@ pub fn cli() -> Option<LogLevel> { // the only config pass-able to the daemon vi
     if let Some(command) = cli.command {
         let cmd = match command {
             CliCommand::StopDaemon => CommandType::Dc(DaemonCommand::Stop),
-            CliCommand::StopThread(c) => CommandType::Tc(RenderThreadCommand::Stop(c)),
             CliCommand::Lock => CommandType::Dc(DaemonCommand::Lock),
         };
         println!("{}", ::pandora::pithos::sockets::write_command_to_daemon_socket(&cmd).expect("could not send command (is the daemon running?)"));

src/daemon.rs

@@ -0,0 +1,24 @@
+use crate::pithos::error::DaemonError;
+use crate::wayland::render_base::{OutputState};
+use crate::{pithos::commands::CommandType, wayland::render_base::RenderThreadState};
+
+use std::fs::File;
+use std::sync::Arc;
+
+use wayrs_client::Connection;
+use wayrs_client::protocol::{WlSurface, WlOutput};
+
+pub trait Daemon {
+    fn log(&self, name: &str, msg: String);
+    fn debug(&self, name: &str, msg: String);
+    fn verbose(&self, name: &str, msg: String);
+
+    fn handle_cmd(self: Arc<Self>, cmd: &CommandType);
+
+    fn load_image(self: Arc<Self>, path: &String) -> Result<(), DaemonError>;
+    fn get_image_dimensions(self: Arc<Self>, img: String) -> Result<(u32, u32), ()>;
+    fn read_img_to_file(self: Arc<Self>, img: &String, f: &File, scale_to: Option<(Option<u32>, Option<u32>)>) -> Result<(u32, u32), DaemonError>;
+
+    fn apply_role_to_surface(self: Arc<Self>, conn: &mut Connection<RenderThreadState>, wl_surface: &WlSurface, wl_output: &WlOutput, output_state: &OutputState);
+}
+

src/lib.rs

@@ -1,2 +1,4 @@
+pub mod daemon;
 pub mod pithos;
+pub mod threads;
 pub mod wayland;

src/main.rs

@@ -1,6 +1,5 @@
 mod cli;
 mod pandora;
-mod threads;
 use ::pandora::pithos::config::load_config;
 use std::sync::Arc;
 
@@ -13,22 +12,7 @@ fn main() -> miette::Result<()> {
         None => config.log_level,
     };
 
-    // initialize daemon & ipc handlers, and glue them together.
-    let mut pandora = crate::pandora::Pandora::new(config.clone(), verbosity);
-    // we initialize pandora mutably so that logging can be started
-    //  => other threads have The Logging Abstraction available for the entirety of their runtime
-    let ipc = crate::threads::ipc::InboundCommandHandler::new();
-    let outputs = crate::threads::outputs::OutputHandler::new(config.clone());
-    let niri = crate::threads::niri::NiriAgent::new(config.clone());
-    let config_watcher = crate::threads::config::ConfigWatcher::new();
-
-    Arc::make_mut(&mut pandora).bind_threads(
-        ipc.clone(),
-        outputs.clone(),
-        niri.clone(),
-        config_watcher.clone(),
-    );
-
-    // give the subthreads a weak pointer now that we're done mutating pandora into some sort of daemon
-    Ok(pandora.start(Arc::downgrade(&pandora)))
+    let pandora = crate::pandora::Pandora::new(config.clone(), verbosity);
+    let weak = Arc::downgrade(&pandora);
+    pandora.start(weak, config.clone())
 }