Cli (#15)

* restructure

* add IPC

* update cargo lock

Author: klaatu01

Cargo.lock

@@ -33,4 +33,4 @@ features = [
 ]
 
 [workspace]
-members = ["yal-backend","crates/yal-core", "crates/lightsky-sys", "crates/lightsky", "crates/yal-theme", "crates/yal-watcher", "crates/yal-plugin", "crates/yal-config" ]
+members = ["yal-backend","crates/yal-core", "crates/lightsky-sys", "crates/lightsky", "crates/yal-theme", "crates/yal-watcher", "crates/yal-plugin", "crates/yal-config" , "crates/yal-ipc" , "crates/yal-cli" ]

Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "yal-cli"
+version = "0.0.0"
+edition = "2024"
+
+[dependencies]
+clap = { version = "4.5.51", features = ["derive"] }
+serde_json = "1.0.145"
+tokio = { version = "1.48.0", features = ["macros", "rt", "rt-multi-thread"] }
+yal-ipc = { path = "../yal-ipc" }
+yal-plugin = { path = "../yal-plugin" }

crates/yal-cli/Cargo.toml

@@ -0,0 +1,74 @@
+use std::time::Duration;
+
+use clap::{Parser, Subcommand};
+use yal_ipc::{YalIPCClient, connect, context, context_with_deadline};
+
+async fn client() -> YalIPCClient {
+    let client = connect().await.unwrap_or_else(|_| {
+        eprintln!("Failed to connect to yal IPC socket, is yal running?");
+        std::process::exit(1);
+    });
+
+    client
+        .ping(context_with_deadline(Duration::from_secs(2)))
+        .await
+        .unwrap_or_else(|_| {
+            eprintln!("Failed to communicate with yal IPC server, you may need to restart yal");
+            std::process::exit(1);
+        });
+
+    client
+}
+
+#[derive(Subcommand)]
+enum MetadataCommands {
+    Tree,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    Metadata {
+        #[command(subcommand)]
+        command: MetadataCommands,
+    },
+}
+
+#[derive(Parser)]
+#[command(
+    name = "yal",
+    version = "0.1",
+    about = "cli for interacting with yal backend"
+)]
+struct Cli {
+    #[command(subcommand)]
+    command: Commands,
+
+    #[arg(short, long, default_value_t = false)]
+    pretty_print: bool,
+}
+
+fn print_json(value: &serde_json::Value, pretty: bool) {
+    if pretty {
+        println!("{}", serde_json::to_string_pretty(value).unwrap());
+    } else {
+        println!("{}", serde_json::to_string(value).unwrap());
+    }
+}
+
+#[tokio::main]
+async fn main() {
+    let cli = Cli::parse();
+    let client = client().await;
+
+    match cli.command {
+        Commands::Metadata { command } => match command {
+            MetadataCommands::Tree => {
+                let response = client.tree(context()).await.unwrap_or_else(|_| {
+                    eprintln!("Failed to get metadata tree from yal IPC server");
+                    std::process::exit(1);
+                });
+                print_json(&response, cli.pretty_print);
+            }
+        },
+    }
+}

crates/yal-cli/src/main.rs

@@ -0,0 +1,17 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum AlignH {
+    Left,
+    Center,
+    Right,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum AlignV {
+    Top,
+    Center,
+    Bottom,
+}

crates/yal-core/src/align.rs

@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub struct AppInfo {
+    pub name: String,
+    pub path: String,
+}

crates/yal-core/src/app.rs

@@ -0,0 +1,71 @@
+use crate::{app::AppInfo, window_target::WindowTarget};
+use serde::{Deserialize, Serialize};
+use std::fmt::{self, Display};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum Command {
+    App(AppInfo),
+    Switch(WindowTarget),
+    Theme(String),
+    Plugin {
+        plugin_name: String,
+        command_name: String,
+        args: Option<serde_json::Value>,
+    },
+}
+
+impl Display for Command {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}:{}", self.prefix(), self.name())
+    }
+}
+
+impl Command {
+    pub fn name(&self) -> String {
+        match self {
+            Command::App(app) => app.name.clone(),
+            Command::Switch(t) => {
+                if let Some(title) = &t.title {
+                    format!("{} - {}", t.app_name, title)
+                } else {
+                    t.app_name.clone()
+                }
+            }
+            Command::Theme(name) => name.clone(),
+            Command::Plugin {
+                plugin_name,
+                command_name,
+                ..
+            } => format!("{} - {}", plugin_name, command_name),
+        }
+    }
+
+    pub fn prefix(&self) -> &str {
+        match self {
+            Command::App(_) => "app",
+            Command::Switch(_) => "switch",
+            Command::Theme(_) => "theme",
+            Command::Plugin { .. } => "plugin",
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum CommandKind {
+    App,
+    Switch,
+    Theme,
+    Plugin,
+}
+
+impl CommandKind {
+    pub fn is_kind(&self, cmd: &Command) -> bool {
+        matches!(
+            (self, cmd),
+            (CommandKind::App, Command::App(_))
+                | (CommandKind::Switch, Command::Switch(_))
+                | (CommandKind::Theme, Command::Theme(_))
+                | (CommandKind::Plugin, Command::Plugin { .. })
+        )
+    }
+}

crates/yal-core/src/command.rs

@@ -0,0 +1,43 @@
+use crate::align::{AlignH, AlignV};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct AppConfig {
+    pub window: Option<WindowConfig>,
+    pub theme: Option<String>,
+    pub font: Option<FontConfig>,
+    pub keys: Option<KeysConfig>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct KeysConfig {
+    pub shortcuts: Option<Vec<crate::shortcut::Shortcut>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct FontConfig {
+    pub font: Option<String>,
+    pub font_size: Option<f32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct WindowConfig {
+    pub w_width: Option<f64>,
+    pub w_height: Option<f64>,
+    pub align_h: Option<AlignH>,
+    pub align_v: Option<AlignV>,
+    pub margin_x: Option<f64>,
+    pub margin_y: Option<f64>,
+    pub padding: Option<f64>,
+    pub line_height: Option<f64>,
+    pub w_radius: Option<f64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct Theme {
+    pub name: Option<String>,
+    pub bg_color: Option<String>,
+    pub fg_color: Option<String>,
+    pub bg_font_color: Option<String>,
+    pub fg_font_color: Option<String>,
+}

crates/yal-core/src/config.rs

@@ -0,0 +1,7 @@
+use serde::Serialize;
+
+#[derive(Serialize, serde::Deserialize, Clone)]
+pub struct FrontendRequest<T: Send + Serialize + Clone + 'static> {
+    pub id: String,
+    pub data: T,
+}