Use features to separate pa_eq and pa_effects + slightly better logging

10 files changed, 50 insertions, 21 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 840e065..9bf61e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,12 @@ version = "0.1.0"
 authors = ["Minijackson <minijackson@riseup.net>"]
 repository = "https://github.com/minijackson/set_eq"
 
+[features]
+default = ["pa-eq", "pa-effects"]
+
+pa-eq = ["dbus"]
+pa-effects = ["serde_json"]
+
 [build-dependencies]
 lalrpop = "0.15.2"
 clap = "2.32.0"
@@ -12,8 +18,6 @@ clap-log-flag = "0.1"
 structopt = "0.2"
 
 [dependencies]
-dbus = "0.6.2"
-
 #clap = { git = "https://github.com/kbknapp/clap-rs", branch = "v3-master" }
 clap = "2.32.0"
 clap-verbosity-flag = "0.2"
@@ -26,4 +30,6 @@ failure = "0.1.2"
 lalrpop-util = "0.15.2"
 regex = "1.0.4"
 
-serde_json = "1.0.32"
+dbus = { version = "0.6.2", optional = true }
+
+serde_json = { version = "1.0.32", optional = true }
diff --git a/src/cli.rs b/src/cli.rs
index 4dee538..704c13f 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -4,23 +4,19 @@ use structopt;
 
 #[derive(StructOpt, Debug)]
 #[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
-/// Hello World! How are you doing?
+/// A command-line tool to manipulate PulseAudio's equalizers
 pub struct Cli {
     #[structopt(flatten)]
     pub verbose: clap_verbosity_flag::Verbosity,
     #[structopt(flatten)]
     pub log: clap_log_flag::Log,
-    #[structopt(short = "s", long = "sink")]
-    /// Use the given sink.
-    ///
-    /// By default it will use the last equalized sink it finds
-    pub sink: Option<String>,
     #[structopt(subcommand)]
     pub cmd: Command,
 }
 
 #[derive(StructOpt, Debug)]
 pub enum Command {
+    #[cfg(feature = "pa-eq")]
     #[structopt(name = "pa-eq")]
     /// PulseAudio equalizer related commands
     ///
@@ -28,6 +24,7 @@ pub enum Command {
     /// and is known to sometimes cause crashes, latency or audible
     /// artifacts
     PaEq(pa_eq::Command),
+    #[cfg(feature = "pa-effects")]
     #[structopt(name = "pa-effects")]
     /// PulseEffects equalizer related commands
     PaEffects(pa_effects::Command),
@@ -40,6 +37,7 @@ arg_enum! {
     }
 }
 
+#[cfg(feature = "pa-eq")]
 pub mod pa_eq {
     use super::EqualizerConfFormat;
 
@@ -71,13 +69,25 @@ pub mod pa_eq {
         )]
         /// The file format of the equalizer configuration
         pub format: EqualizerConfFormat,
+        #[structopt(short = "s", long = "sink")]
+        /// Use the given sink.
+        ///
+        /// By default it will use the last equalized sink it finds
+        pub sink: Option<String>,
     }
 
     #[derive(StructOpt, Debug)]
-    pub struct ResetCli {}
+    pub struct ResetCli {
+        #[structopt(short = "s", long = "sink")]
+        /// Use the given sink.
+        ///
+        /// By default it will use the last equalized sink it finds
+        pub sink: Option<String>,
+    }
 
 }
 
+#[cfg(feature = "pa-effects")]
 pub mod pa_effects {
     use super::EqualizerConfFormat;
 
diff --git a/src/main.rs b/src/main.rs
index a23034e..df1732d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-extern crate dbus;
-
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -14,15 +12,20 @@ extern crate structopt;
 
 extern crate lalrpop_util;
 
+#[cfg(feature = "pa-eq")]
+extern crate dbus;
+
+#[cfg(feature = "pa-effects")]
 #[macro_use]
 extern crate serde_json;
 
 mod cli;
-mod dbus_api;
 mod parsing;
 mod utils;
 
+#[cfg(feature = "pa-eq")]
 mod pa_eq;
+#[cfg(feature = "pa-effects")]
 mod pa_effects;
 
 use cli::*;
@@ -75,7 +78,9 @@ fn start() -> Result<(), Error> {
     use Command::*;
 
     match args.cmd {
+        #[cfg(feature = "pa-eq")]
         PaEq(args) => pa_eq::main(args),
+        #[cfg(feature = "pa-effects")]
         PaEffects(args) => pa_effects::main(args),
     }
 }
diff --git a/src/pa_effects.rs b/src/pa_effects.rs
index 9ed0a1f..43d27cb 100644
--- a/src/pa_effects.rs
+++ b/src/pa_effects.rs
@@ -19,8 +19,14 @@ pub fn main(cmd: Command) -> Result<(), Error> {
 fn export_preset(args: ExportPresetCli) -> Result<(), Error> {
     debug!("Parsing base preset");
     let mut preset: serde_json::Value = match args.base_preset {
-        Some(file) => serde_json::from_str(&read_filearg_to_str(&file)?),
-        None => serde_json::from_str(&DEFAULT_PRESET),
+        Some(file) => {
+            info!("Reading base PulseEffects preset from file '{}'", file);
+            serde_json::from_str(&read_filearg_to_str(&file)?)
+        }
+        None => {
+            info!("Using default PulseEffects preset");
+            serde_json::from_str(&DEFAULT_PRESET)
+        }
     }?;
 
     let filter = read_filter_from_arg(&args.file)?;
@@ -65,7 +71,7 @@ fn simplify_filter(filter: Filter) -> Filter {
     let mut partition_size = filter.frequencies.len() / 30;
     let step_error = filter.frequencies.len() as f64 % 30f64;
     if step_error != 0f64 {
-        info!("The approximation will be imperfect");
+        trace!("The approximation will be imperfect");
         partition_size += 1;
     }
 
diff --git a/src/dbus_api/equalizing_manager.rs b/src/pa_eq/dbus_api/equalizing_manager.rs
index 5f6574f..5f6574f 100644
--- a/src/dbus_api/equalizing_manager.rs
+++ b/src/pa_eq/dbus_api/equalizing_manager.rs
diff --git a/src/dbus_api/mod.rs b/src/pa_eq/dbus_api/mod.rs
index a184c55..a184c55 100644
--- a/src/dbus_api/mod.rs
+++ b/src/pa_eq/dbus_api/mod.rs
diff --git a/src/dbus_api/server_lookup.rs b/src/pa_eq/dbus_api/server_lookup.rs
index 78ad4bd..78ad4bd 100644
--- a/src/dbus_api/server_lookup.rs
+++ b/src/pa_eq/dbus_api/server_lookup.rs
diff --git a/src/dbus_api/sink.rs b/src/pa_eq/dbus_api/sink.rs
index 6bd1756..6bd1756 100644
--- a/src/dbus_api/sink.rs
+++ b/src/pa_eq/dbus_api/sink.rs
diff --git a/src/pa_eq.rs b/src/pa_eq/mod.rs
index 4086c31..f7f1875 100644
--- a/src/pa_eq.rs
+++ b/src/pa_eq/mod.rs
@@ -1,10 +1,12 @@
+mod dbus_api;
+
 use Filter;
 use cli::pa_eq::*;
 use utils::*;
 
-use dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager;
-use dbus_api::server_lookup::OrgPulseAudioServerLookup1;
-use dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer;
+use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager;
+use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1;
+use self::dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer;
 
 use dbus::{BusType, ConnPath, Connection};
 
diff --git a/src/utils.rs b/src/utils.rs
index d75971a..26facc4 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -26,7 +26,7 @@ pub fn read_filearg_to_str(file: &str) -> Result<String, Error> {
 
     let mut buffer = String::new();
     if file == "-" {
-        info!("Reading file from the command line");
+        debug!("Reading file from the command line");
         let stdin = io::stdin();
         let mut handle = stdin.lock();
         handle.read_to_string(&mut buffer)?;
@@ -38,7 +38,7 @@ pub fn read_filearg_to_str(file: &str) -> Result<String, Error> {
 }
 
 pub fn read_filter_from_arg(file: &str) -> Result<Filter, Error> {
-    debug!("Reading filter from '{}' in the EqualizerAPO format", file);
+    info!("Reading filter from '{}' in the EqualizerAPO format", file);
     let content = read_filearg_to_str(file)?;
     parse_filter(&content)
 }