From de3e21ec3b0dc2c057bf4334bfd71dc93e821617 Mon Sep 17 00:00:00 2001 From: xavantex Date: Fri, 21 Jun 2024 21:48:40 +0200 Subject: [PATCH 1/3] made ui into rust feature, can now compile wihtout x11libs --- Cargo.toml | 4 +++- src/args.rs | 1 + src/main.rs | 15 +++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a1c5e94..44eca93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,12 +34,14 @@ category = "Utility" allow_downgrades = true [features] +default = ["ui"] +ui = ["dep:ui"] fake_hardware = ["hardware/fake_hardware"] [dependencies] data.workspace = true -ui.workspace = true +ui = { workspace = true, optional = true } thiserror.workspace = true clap.workspace = true log.workspace = true diff --git a/src/args.rs b/src/args.rs index 3a7d967..611c42b 100644 --- a/src/args.rs +++ b/src/args.rs @@ -23,6 +23,7 @@ pub struct Args { )] pub config_name: Option, + #[cfg(feature = "ui")] #[arg( long = "cli", default_value_t = false, diff --git a/src/main.rs b/src/main.rs index 614a2e2..493468e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -43,6 +43,7 @@ fn setup_logs(args: &Args) { builder.filter_level(LevelFilter::Warn); builder.filter_module("hardware", level_filter); builder.filter_module("data", level_filter); + #[cfg(feature = "ui")] builder.filter_module("ui", level_filter); builder.filter_module("fan-control", level_filter); builder @@ -85,6 +86,7 @@ fn try_run() -> Result<()> { let args = Args::parse(); setup_logs(&args); + #[cfg(feature = "ui")] ui::localize::localize(); data::localize::localize(); @@ -112,10 +114,15 @@ fn try_run() -> Result<()> { update: Update::new(), }; - match args.cli { - true => cli::run_cli(app_state), - false => ui::run_ui(app_state), - }; + #[cfg(not(feature = "ui"))] + cli::run_cli(app_state) + #[cfg(feature = "ui")] + { + match args.cli { + true => cli::run_cli(app_state), + false => ui::run_ui(app_state), + }; + } Ok(()) } From 0ac4a845f5eace6b44f5ea1b03c412a765368903 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:03:10 +0200 Subject: [PATCH 2/3] Update src/main.rs --- src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 493468e..a655081 100644 --- a/src/main.rs +++ b/src/main.rs @@ -115,7 +115,8 @@ fn try_run() -> Result<()> { }; #[cfg(not(feature = "ui"))] - cli::run_cli(app_state) + cli::run_cli(app_state); + #[cfg(feature = "ui")] { match args.cli { From b69b561b2056a5a03520144f429ff8b71fc67b2c Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:06:03 +0200 Subject: [PATCH 3/3] Update src/main.rs --- src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index a655081..8ec604b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -116,7 +116,6 @@ fn try_run() -> Result<()> { #[cfg(not(feature = "ui"))] cli::run_cli(app_state); - #[cfg(feature = "ui")] { match args.cli {