1 files changed, 19 insertions, 7 deletions

diff --git a/src/utils.rs b/src/utils.rs
index 5aae29d..6d7ae58 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -9,7 +9,7 @@ use ::dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer;
 use dbus::{BusType, Connection, ConnPath};
 use failure::{Error, ResultExt};
 
-use std::io::{self, Read};
+use std::io;
 
 pub fn connect() -> Result<Connection, Error> {
     let pulse_sock_path =
@@ -36,7 +36,7 @@ pub fn get_equalized_sink<'a>(conn: &'a Connection) -> Result<ConnPath<'a, &'a C
 pub fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<(), Error> {
     let channel = conn_sink.get_nchannels()?;
     info!("Using channel: {}", channel);
-    trace!("Sending filter");
+    trace!("Sending filter: {:?}", filter);
     conn_sink.seed_filter(
         channel,
         filter.frequencies,
@@ -46,17 +46,15 @@ pub fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<
     Ok(())
 }
 
-pub fn read_filter() -> Result<Filter, Error> {
+pub fn read_filter(file: &mut impl io::Read) -> Result<Filter, Error> {
     let mut buffer = String::new();
-    let stdin = io::stdin();
-    let mut handle = stdin.lock();
 
     info!("Reading filter in GraphicEQ format from the command line");
-    handle.read_to_string(&mut buffer)?;
+    file.read_to_string(&mut buffer)?;
 
     // TODO: lifetime issue when "throwing" parse error
     let filter = EqualizerApoParser::new().parse(&buffer).unwrap();
-    info!("Parsed filter: {:?}", filter);
+    trace!("Parsed filter: {:?}", filter);
 
     Ok(filter)
 }
@@ -69,3 +67,17 @@ fn get_pulse_dbus_sock() -> Result<String, Error> {
     trace!("Checking PulseAudio's D-Bus socket path");
     Ok(conn.get_address()?)
 }
+
+/*
+fn introspect(conn: &dbus::ConnPath<&Connection>) {
+    let mut thing = conn
+        .method_call_with_args(
+            &"org.freedesktop.DBus.Introspectable".into(),
+            &"Introspect".into(),
+            |_| {},
+        ).unwrap();
+    thing.as_result().unwrap();
+
+    println!("{}", thing.iter_init().read::<String>().unwrap());
+}
+*/