From 2c433398e0aac61a3371fcf271f5cff72b5f2069 Mon Sep 17 00:00:00 2001
From: djairoh <ljxjah@mykolab.com>
Date: Thu, 11 May 2023 08:53:44 +0200
Subject: [PATCH] updated some error output

---
 src/main.rs           | 32 ++++++++++++++++++++++++--------
 src/print_players.rs  |  3 ++-
 src/update_message.rs |  4 +---
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 256c849..a98a1a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,10 @@
 use core::time;
+use std::process::exit;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread;
 use clap::Parser;
-use log::error;
+use log::{error, info};
 use mpris::PlayerFinder;
 use structs::cli::Cli;
 use structs::{config::Config, data::Data};
@@ -20,7 +21,15 @@ mod print_players;
 
 fn handle_signal(data: &Data) {
   if let Some(p) = &data.current_player {
-    let _ = p.checked_play_pause();
+    match p.checked_play_pause() {
+        Ok(b) => {
+          match b {
+            true => info!("Player play/paused succesfully!"),
+            false => info!("Failed to send play/pause signal!"),
+        }
+      },
+        Err(e) => error!("{e}"),
+    }
   }
 }
 
@@ -33,7 +42,8 @@ fn default_loop(pf: &PlayerFinder, cfg: &Config, data: &mut Data, r: &Vec<String
 fn main() {
     std::env::set_var("RUST_LOG", "error");
     if let Err(e) = env_logger::init() {
-      panic!("{}", e);
+      error!("{e}");
+      return
     }
 
     let cli = Cli::parse();
@@ -44,11 +54,18 @@ fn main() {
 
         let term = Arc::new(AtomicBool::new(false));
         
-        let pf: PlayerFinder = PlayerFinder::new()
-          .expect("Failed to connect to Dbus!");
-        
+        let pf: PlayerFinder;        
+        match PlayerFinder::new() {
+            Ok(finder) => pf = finder,
+            Err(e) => {
+              error!("{e}");
+              return
+            },
+        }
+
         if let Err(e) = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&term)) {
-          panic!("{}", e);
+          error!("{e}");
+          return
         }
 
         loop {
@@ -66,7 +83,6 @@ fn main() {
       },
     Err(e) => {
       error!("{e}");
-      println!("Failed to read config file {}", cli.config_file);
     },
   };
 }
diff --git a/src/print_players.rs b/src/print_players.rs
index 665fc7c..2571827 100644
--- a/src/print_players.rs
+++ b/src/print_players.rs
@@ -1,3 +1,4 @@
+use log::error;
 use mpris::PlayerFinder;
 
 
@@ -12,6 +13,6 @@ pub fn print_players(pf: &PlayerFinder) {
                 }
             }
         },
-        Err(e) => println!("{}", e),
+        Err(e) => error!("{e}"),
     }
 }
\ No newline at end of file
diff --git a/src/update_message.rs b/src/update_message.rs
index 7de93f8..561b428 100644
--- a/src/update_message.rs
+++ b/src/update_message.rs
@@ -1,8 +1,6 @@
-use log::error;
 use mpris::{MetadataValue};
-use string_builder::Builder;
 
-use crate::structs::{config::{Rating, Config}, data::Data};
+use crate::structs::{config::Config, data::Data};
 
 fn value_to_string(v: &MetadataValue, sep: char) -> String {
   match v {