From 7eac9cfbc66c272edaf8c5207b4beaca247d5209 Mon Sep 17 00:00:00 2001 From: krolxon Date: Sun, 28 Apr 2024 18:00:26 +0530 Subject: [PATCH] minor changes --- README.md | 6 +++--- src/browser.rs | 8 +------- src/connection.rs | 15 +++++++++++---- src/ui.rs | 1 - 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 0d4e2b7..7c6cfc0 100755 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ A MPD client in Rust ### TODO - [x] fix performance issues -- [ ] improvements on queue control +- [x] improvements on queue control - [x] add to playlists +- [x] search for songs +- [x] Humantime format - [ ] view playlist - [ ] change playlist name -- [x] search for songs - [ ] metadata based tree view -- [x] Humantime format diff --git a/src/browser.rs b/src/browser.rs index 9add421..895eaa0 100755 --- a/src/browser.rs +++ b/src/browser.rs @@ -1,8 +1,4 @@ -use crate::{ - app::{App, AppResult}, - connection::Connection, - song::RSong, -}; +use crate::{app::AppResult, connection::Connection, song::RSong}; #[derive(Debug)] pub struct FileBrowser { @@ -76,8 +72,6 @@ impl FileBrowser { } } - - pub fn handle_go_back(&mut self, conn: &mut Connection) -> AppResult<()> { if self.prev_path != "." { let r = self.path.rfind("/").unwrap(); diff --git a/src/connection.rs b/src/connection.rs index 2add4e2..a929385 100755 --- a/src/connection.rs +++ b/src/connection.rs @@ -28,7 +28,7 @@ impl Connection { let mut conn = Client::connect(addrs).unwrap(); let empty_song = Song { - file: "No Song in the Queue".to_string(), + file: "No Song playing or in Queue".to_string(), artist: None, title: None, duration: None, @@ -52,7 +52,10 @@ impl Connection { let repeat = status.repeat; let random = status.random; - let current_song = conn.currentsong().unwrap_or_else(|_| Some(empty_song.clone())).unwrap_or_else(|| empty_song); + let current_song = conn + .currentsong() + .unwrap_or_else(|_| Some(empty_song.clone())) + .unwrap_or_else(|| empty_song); Ok(Self { conn, songs_filenames, @@ -93,8 +96,12 @@ impl Connection { /// Update status pub fn update_status(&mut self) { let status = self.conn.status().unwrap(); - let empty_song = self.get_song_with_only_filename("No Song in the Queue"); - let current_song = self.conn.currentsong().unwrap_or_else(|_| Some(empty_song.clone())).unwrap_or_else(|| empty_song); + let empty_song = self.get_song_with_only_filename("No Song playing or in Queue"); + let current_song = self + .conn + .currentsong() + .unwrap_or_else(|_| Some(empty_song.clone())) + .unwrap_or_else(|| empty_song); // Playback State match status.state { diff --git a/src/ui.rs b/src/ui.rs index c25d913..edbf429 100755 --- a/src/ui.rs +++ b/src/ui.rs @@ -1,5 +1,4 @@ use crate::app::{App, SelectedTab}; -use clap::builder::styling::RgbColor; use ratatui::{ prelude::*, widgets::{block::Title, *},