From e2e2f14accc751573a2a52b43bd8c87e1f1b89db Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 4 Sep 2018 18:40:41 +0200
Subject: Centralize error context + properly report parse errors

---
 src/main.rs | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 310fa1a..360117c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,6 +12,8 @@ extern crate clap_verbosity_flag;
 #[macro_use]
 extern crate structopt;
 
+extern crate lalrpop_util;
+
 mod dbus_api;
 mod parsing;
 mod utils;
@@ -19,7 +21,7 @@ mod utils;
 use utils::*;
 
 use dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer;
-use failure::{Error, ResultExt};
+use failure::Error;
 use structopt::StructOpt;
 
 use std::fs::File;
@@ -81,10 +83,6 @@ arg_enum! {
 #[derive(StructOpt, Debug)]
 struct ResetCli {}
 
-#[derive(Fail, Debug)]
-#[fail(display = "No equalized sink found")]
-struct NoEqualizedSink;
-
 #[derive(Debug)]
 pub struct Filter {
     preamp: f64,
@@ -136,12 +134,8 @@ fn start() -> Result<(), Error> {
 }
 
 fn reset(args: ResetCli) -> Result<(), Error> {
-    let conn = connect().context(
-        "Could not connect to PulseAudio's D-Bus socket. Have you loaded the 'module-dbus-protocol' module?"
-    )?;
-    let conn_sink = get_equalized_sink(&conn).context(
-        "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?",
-    )?;
+    let conn = connect()?;
+    let conn_sink = get_equalized_sink(&conn)?;
     let filter_rate = conn_sink.get_filter_sample_rate()?;
     let filter = Filter {
         preamp: 1f64,
@@ -155,12 +149,8 @@ fn reset(args: ResetCli) -> Result<(), Error> {
 }
 
 fn load(args: LoadCli) -> Result<(), Error> {
-    let conn = connect().context(
-        "Could not connect to PulseAudio's D-Bus socket. Have you loaded the 'module-dbus-protocol' module?"
-    )?;
-    let conn_sink = get_equalized_sink(&conn).context(
-        "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?",
-    )?;
+    let conn = connect()?;
+    let conn_sink = get_equalized_sink(&conn)?;
 
     let filter = if args.file == "-" {
         let stdin = io::stdin();
-- 
cgit v1.2.3