[[package]]
name = "mpd_info_screen"
-version = "0.2.13"
+version = "0.2.14"
dependencies = [
"ggez",
"image",
[package]
name = "mpd_info_screen"
-version = "0.2.13"
+version = "0.2.14"
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
# Usage
- mpd_info_screen 0.2.13
+ mpd_info_screen 0.2.14
USAGE:
mpd_info_screen [FLAGS] [OPTIONS] <host> [port]
-V, --version Prints version information
OPTIONS:
- -l, --log-level <log-level> [default: ERROR] [possible values: ERROR, WARNING, DEBUG, VERBOSE]
+ -l, --log-level <log-level> [default: Error] [possible values: Error, Warning, Debug, Verbose]
-p <password>
ARGS:
<host>
<port> [default: 6600]
+
Note that presing the Escape key when the window is focused closes the program.
Also note that pressing the H key while displaying text will hide the text.
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum LogState {
- ERROR,
- WARNING,
- DEBUG,
- VERBOSE,
+ Error,
+ Warning,
+ Debug,
+ Verbose,
}
arg_enum! {
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum LogLevel {
- ERROR,
- WARNING,
- DEBUG,
- VERBOSE,
+ Error,
+ Warning,
+ Debug,
+ Verbose,
}
}
where
T: Display,
{
- if state == LogState::ERROR {
+ if state == LogState::Error {
log_error(msg);
- } else if state == LogState::WARNING {
- if level != LogLevel::ERROR {
+ } else if state == LogState::Warning {
+ if level != LogLevel::Error {
log_warning(msg);
}
- } else if state == LogState::DEBUG {
- if level == LogLevel::DEBUG || level == LogLevel::VERBOSE {
+ } else if state == LogState::Debug {
+ if level == LogLevel::Debug || level == LogLevel::Verbose {
log_debug(msg);
}
- } else if state == LogState::VERBOSE {
- if level == LogLevel::VERBOSE {
+ } else if state == LogState::Verbose {
+ if level == LogLevel::Verbose {
log_verbose(msg);
}
} else {
where
T: Display,
{
- println!("ERROR: {}", msg);
+ println!("Error: {}", msg);
}
pub fn log_warning<T>(msg: T)
where
T: Display,
{
- println!("WARNING: {}", msg);
+ println!("Warning: {}", msg);
}
pub fn log_debug<T>(msg: T)
where
T: Display,
{
- println!("DEBUG: {}", msg);
+ println!("Debug: {}", msg);
}
pub fn log_verbose<T>(msg: T)
where
T: Display,
{
- println!("VERBOSE: {}", msg);
+ println!("Verbose: {}", msg);
}
}
log(
"Successfully initialized MPDHandler",
- debug_log::LogState::DEBUG,
+ debug_log::LogState::Debug,
self.opts.log_level,
);
} else {
self.is_valid = false;
log(
"Failed to initialize MPDHandler",
- debug_log::LogState::DEBUG,
+ debug_log::LogState::Debug,
self.opts.log_level,
);
}
"Got image_format type {}",
read_guard_opt.as_ref().unwrap().get_art_type()
),
- debug_log::LogState::DEBUG,
+ debug_log::LogState::Debug,
self.opts.log_level,
);
.unwrap()
.force_try_other_album_art()
.map_err(|_| String::from("Failed to force try other album art fetching method"))?;
- return Err("Got unknown format album art image".into());
+ Err("Got unknown format album art image".into())
};
if is_unknown_format && !self.tried_album_art_in_dir {
let img_result = ImageReader::with_format(Cursor::new(&image_ref), image_format)
.decode()
- .map_err(|e| format!("ERROR: Failed to decode album art image: {}", e));
+ .map_err(|e| format!("Error: Failed to decode album art image: {}", e));
if img_result.is_err() && !self.tried_album_art_in_dir {
return try_second_art_fetch_method(
&mut self.tried_album_art_in_dir,
rgba8.height() as u16,
rgba8.as_raw(),
)
- .map_err(|e| format!("ERROR: Failed to load album art image in ggez Image: {}", e))?;
+ .map_err(|e| format!("Error: Failed to load album art image in ggez Image: {}", e))?;
self.album_art = Some(ggez_img);
text_height_limit
})
{
- current_x = current_x * DECREASE_AMT;
- current_y = current_y * DECREASE_AMT;
+ current_x *= DECREASE_AMT;
+ current_y *= DECREASE_AMT;
continue;
} else if screen_coords.w * MIN_WIDTH_RATIO > width {
- current_x = current_x * INCREASE_AMT;
- current_y = current_y * INCREASE_AMT;
+ current_x *= INCREASE_AMT;
+ current_y *= INCREASE_AMT;
continue;
} else {
break;
} else {
log(
"filename text is empty",
- debug_log::LogState::WARNING,
+ debug_log::LogState::Warning,
self.opts.log_level,
);
}
} else {
log(
"artist text is empty",
- debug_log::LogState::WARNING,
+ debug_log::LogState::Warning,
self.opts.log_level,
);
}
} else {
log(
"title text is empty",
- debug_log::LogState::WARNING,
+ debug_log::LogState::Warning,
self.opts.log_level,
);
}
{
log(
"dirty_flag cleared, acquiring shared data...",
- debug_log::LogState::DEBUG,
+ debug_log::LogState::Debug,
self.opts.log_level,
);
self.shared = self
} else {
log(
"Failed to acquire read lock for getting shared data",
- debug_log::LogState::DEBUG,
+ debug_log::LogState::Debug,
self.opts.log_level,
);
}
if self.album_art.is_none() {
let result = self.get_image_from_data(ctx);
if let Err(e) = result {
- log(e, debug_log::LogState::WARNING, self.opts.log_level);
+ log(e, debug_log::LogState::Warning, self.opts.log_level);
self.album_art = None;
self.album_art_draw_transform = None;
} else {
short = "l",
long = "log-level",
possible_values = &debug_log::LogLevel::variants(),
- default_value = "ERROR",
+ default_value = "Error",
case_insensitive = true,
)]
log_level: debug_log::LogLevel,
}
x => log(
format!("Other window event fired: {:?}", x),
- debug_log::LogState::VERBOSE,
+ debug_log::LogState::Verbose,
opt.log_level,
),
},
let mut game_result: Result<(), GameError> = display.update(ctx);
if game_result.is_err() {
- println!("ERROR update: {}", game_result.unwrap_err());
+ println!("Error update: {}", game_result.unwrap_err());
*control_flow = ControlFlow::Exit;
return;
}
game_result = display.draw(ctx);
if game_result.is_err() {
- println!("ERROR draw: {}", game_result.unwrap_err());
+ println!("Error draw: {}", game_result.unwrap_err());
*control_flow = ControlFlow::Exit;
return;
}
}
x => log(
format!("Device event fired: {:?}", x),
- debug_log::LogState::VERBOSE,
+ debug_log::LogState::Verbose,
opt.log_level,
),
}
buf_to_read = buf_to_read.split_off(2);
result = String::from("OK");
buf.append(&mut buf_to_read);
- //println!("WARNING: OK was reached"); // DEBUG
+ //println!("Warning: OK was reached"); // DEBUG
return Ok(result);
}
}
result.push(c);
skip_count = s - 1;
} else if let Err((msg, count)) = next_char_result {
- //println!("ERROR: {}", msg); // DEBUG
+ //println!("Error: {}", msg); // DEBUG
for i in 0..count {
saved.push(buf_to_read[idx + i as usize]);
}
// main thread failed to store handle to this thread
log(
"MPDHandle thread stopping due to failed handle storage",
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
break 'main;
if let Err(err_string) = self.handler_read_block(&mut buf, &mut saved, &mut saved_str) {
log(
format!("read_block error: {}", err_string),
- LogState::WARNING,
+ LogState::Warning,
log_level,
);
} else if let Err(err_string) = self.handler_write_block() {
log(
format!("write_block error: {}", err_string),
- LogState::WARNING,
+ LogState::Warning,
log_level,
);
}
log(
"MPDHandler thread entering exit loop",
- LogState::DEBUG,
+ LogState::Debug,
log_level,
);
'exit: loop {
write_handle.art_data.len(),
write_handle.art_data_size
),
- LogState::DEBUG,
+ LogState::Debug,
write_handle.log_level,
);
if write_handle.art_data.len() == write_handle.art_data_size {
write_handle.art_data.len(),
write_handle.art_data_size
),
- LogState::DEBUG,
+ LogState::Debug,
write_handle.log_level,
);
if write_handle.art_data.len() == write_handle.art_data_size {
write_handle.is_init = false;
log(
"Got initial \"OK\" from MPD",
- LogState::DEBUG,
+ LogState::Debug,
write_handle.log_level,
);
write_handle.poll_state = PollState::None;
if line.starts_with("OK") {
log(
format!("Got OK when poll state is {:?}", write_handle.poll_state),
- LogState::DEBUG,
+ LogState::Debug,
write_handle.log_level,
);
match write_handle.poll_state {
write_handle.dirty_flag.store(true, Ordering::Relaxed);
log(
"No embedded album art",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
write_handle.dirty_flag.store(true, Ordering::Relaxed);
log(
"No album art in dir",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
write_handle.poll_state = PollState::None;
break 'handle_buf;
} else if line.starts_with("ACK") {
- log(line, LogState::WARNING, write_handle.log_level);
+ log(line, LogState::Warning, write_handle.log_level);
match write_handle.poll_state {
PollState::Password => {
write_handle.can_authenticate = false;
write_handle.dirty_flag.store(true, Ordering::Relaxed);
log(
"Failed to get readpicture",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
// Not setting error_text here since
write_handle.dirty_flag.store(true, Ordering::Relaxed);
log(
"Failed to get albumart",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
write_handle.error_text = "Failed to get album art from MPD".into();
} else {
log(
"Failed to parse current song position",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
} else {
log(
"Failed to parse current song duration",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
} else {
log(
"Failed to parse album art byte size",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
} else {
log(
"Failed to parse album art chunk byte size",
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
} else {
log(
format!("Got unrecognized/ignored line: {}", line),
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
}
saved.len(),
read_line_in_progress.len()
),
- LogState::WARNING,
+ LogState::Warning,
write_handle.log_level,
);
*saved_str = read_line_in_progress;
} else if let Err(e) = write_result {
log(
format!("Failed to send password for authentication: {}", e),
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
}
} else if let Err(e) = write_result {
log(
format!("Failed to request song info over stream: {}", e),
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
}
} else if let Err(e) = write_result {
log(
format!("Failed to request status over stream: {}", e),
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
}
} else if let Err(e) = write_result {
log(
format!("Failed to request album art: {}", e),
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
}
} else if let Err(e) = write_result {
log(
format!("Failed to request album art in dir: {}", e),
- LogState::ERROR,
+ LogState::Error,
write_handle.log_level,
);
}
self.art_data_size,
self.art_data.len()
),
- LogState::DEBUG,
+ LogState::Debug,
self.log_level,
);
self.art_data_size != 0 && self.art_data.len() == self.art_data_size
projects / mpd_info_screen / commitdiff
