Skip to content

Commit

Permalink
Make clippy happy
Browse files Browse the repository at this point in the history
  • Loading branch information
ryze312 committed Jul 14, 2024
1 parent caa7d4c commit 87f401f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/discord_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ impl MpvEventHandler for DiscordClient {
MpvEvent::FileLoaded(file_info) => self.set_presence(file_info),
MpvEvent::Seek(remaining_time) => self.set_timestamps(remaining_time),
MpvEvent::Play(remaining_time) => self.set_timestamps(remaining_time),
MpvEvent::Pause(_) => self.clear_timestamps(),
MpvEvent::Pause => self.clear_timestamps(),
MpvEvent::Buffering => self.clear_timestamps(),
MpvEvent::Toggle => self.toggle_activity(),
MpvEvent::Exit => self.close(),
Expand Down
2 changes: 1 addition & 1 deletion src/discord_client/music_brainz.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn get_cover_art_from_query(query: String) -> Option<String> {
Err(_) => return None
};

let release = match result.entities.get(0) {
let release = match result.entities.first() {
Some(group) => group,
None => return None
};
Expand Down
4 changes: 3 additions & 1 deletion src/logging.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::env;

pub mod macros;

#[allow(unused_imports)]
pub use macros::{error, warning, info};

#[allow(dead_code)]
Expand Down Expand Up @@ -40,7 +42,7 @@ impl Logger {
pub fn from_env() -> Self {
let level = env::var("MPV_RPC_LOG").unwrap_or_default();
let level: u32 = level.parse().unwrap_or(LogLevel::Error as u32);

let log_level = LogLevel::from(level);
Self {
log_level
Expand Down
12 changes: 6 additions & 6 deletions src/mpv_event_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ pub struct MpvEventQueue {
}

impl MpvEventQueue {
pub fn new(mpv: Handle,logger: Rc<Logger>) -> Result<Self, &'static str> {
pub fn new(mpv: Handle,logger: Rc<Logger>) -> Result<Self, &'static str> {
let new_self = Self {
mpv,
logger,
};
new_self.initialize()?;

new_self.initialize()?;
Ok(new_self)
}

Expand Down Expand Up @@ -50,7 +50,7 @@ impl MpvEventQueue {
MpvRequest::OSDMessage(message) => self.display_osd_message(message)
}
}

pub fn display_osd_message(&self, message: &str) -> Result<(), &'static str> {
match self.mpv.osd_message(message, Duration::from_secs(1)) {
Ok(()) => Ok(()),
Expand Down Expand Up @@ -111,7 +111,7 @@ impl MpvEventQueue {
let time = self.get_remaining_time();
match pause {
false => Some(MpvEvent::Play(time)),
true => Some(MpvEvent::Pause(time))
true => Some(MpvEvent::Pause)
}
}

Expand All @@ -133,7 +133,7 @@ impl MpvEventQueue {
fn get_toggle_event(&self, message: ClientMessage) -> Option<MpvEvent> {
let command = message.args().join(" ");
logging::info!(self.logger, "Client message: {command}");

if command.starts_with("key-binding toggle-rpc d-") {
Some(MpvEvent::Toggle)
}
Expand Down
2 changes: 1 addition & 1 deletion src/mpv_event_queue/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub enum MpvEvent {
Exit,
FileLoaded(FileInfo),
Play(i64),
Pause(i64),
Pause,
Seek(i64)
}

Expand Down

0 comments on commit 87f401f

Please sign in to comment.