updated some error output

This commit is contained in:
Djairo Hougee 2023-05-11 08:53:44 +02:00
parent dcb8c04513
commit 2c433398e0
3 changed files with 27 additions and 12 deletions

View File

@ -1,9 +1,10 @@
use core::time; use core::time;
use std::process::exit;
use std::sync::Arc; use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::thread; use std::thread;
use clap::Parser; use clap::Parser;
use log::error; use log::{error, info};
use mpris::PlayerFinder; use mpris::PlayerFinder;
use structs::cli::Cli; use structs::cli::Cli;
use structs::{config::Config, data::Data}; use structs::{config::Config, data::Data};
@ -20,7 +21,15 @@ mod print_players;
fn handle_signal(data: &Data) { fn handle_signal(data: &Data) {
if let Some(p) = &data.current_player { 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() { fn main() {
std::env::set_var("RUST_LOG", "error"); std::env::set_var("RUST_LOG", "error");
if let Err(e) = env_logger::init() { if let Err(e) = env_logger::init() {
panic!("{}", e); error!("{e}");
return
} }
let cli = Cli::parse(); let cli = Cli::parse();
@ -44,11 +54,18 @@ fn main() {
let term = Arc::new(AtomicBool::new(false)); let term = Arc::new(AtomicBool::new(false));
let pf: PlayerFinder = PlayerFinder::new() let pf: PlayerFinder;
.expect("Failed to connect to Dbus!"); 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)) { if let Err(e) = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&term)) {
panic!("{}", e); error!("{e}");
return
} }
loop { loop {
@ -66,7 +83,6 @@ fn main() {
}, },
Err(e) => { Err(e) => {
error!("{e}"); error!("{e}");
println!("Failed to read config file {}", cli.config_file);
}, },
}; };
} }

View File

@ -1,3 +1,4 @@
use log::error;
use mpris::PlayerFinder; use mpris::PlayerFinder;
@ -12,6 +13,6 @@ pub fn print_players(pf: &PlayerFinder) {
} }
} }
}, },
Err(e) => println!("{}", e), Err(e) => error!("{e}"),
} }
} }

View File

@ -1,8 +1,6 @@
use log::error;
use mpris::{MetadataValue}; 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 { fn value_to_string(v: &MetadataValue, sep: char) -> String {
match v { match v {