Commit 7eac9cf

rmptui7eac9cf

minor changes

+15 −15

4 files changed

−Context 3+

M README.md View

M src/browser.rs View

M src/connection.rs View

M src/ui.rs View

		@@ -34,10 +34,10 @@ A MPD client in Rust
34	34
35	35		### TODO
36	36		- [x] fix performance issues
37		−	- [ ] improvements on queue control
	37	+	- [x] improvements on queue control
38	38		- [x] add to playlists
	39	+	- [x] search for songs
	40	+	- [x] Humantime format
39	41		- [ ] view playlist
40	42		- [ ] change playlist name
41		−	- [x] search for songs
42	43		- [ ] metadata based tree view
43		−	- [x] Humantime format

		@@ -1,8 +1,4 @@
1		−	use crate::{
2		−	app::{App, AppResult},
3		−	connection::Connection,
4		−	song::RSong,
5		−	};
	1	+	use crate::{app::AppResult, connection::Connection, song::RSong};
6	2
7	3		#[derive(Debug)]
8	4		pub struct FileBrowser {
		@@ -76,8 +72,6 @@ impl FileBrowser {
76	72		}
77	73		}
78	74
79		−
80		−
81	75		pub fn handle_go_back(&mut self, conn: &mut Connection) -> AppResult<()> {
82	76		if self.prev_path != "." {
83	77		let r = self.path.rfind("/").unwrap();

		@@ -28,7 +28,7 @@ impl Connection {
28	28		let mut conn = Client::connect(addrs).unwrap();
29	29
30	30		let empty_song = Song {
31		−	file: "No Song in the Queue".to_string(),
	31	+	file: "No Song playing or in Queue".to_string(),
32	32		artist: None,
33	33		title: None,
34	34		duration: None,
		@@ -52,7 +52,10 @@ impl Connection {
52	52		let repeat = status.repeat;
53	53		let random = status.random;
54	54
55		−	let current_song = conn.currentsong().unwrap_or_else(\|_\| Some(empty_song.clone())).unwrap_or_else(\|\| empty_song);
	55	+	let current_song = conn
	56	+	.currentsong()
	57	+	.unwrap_or_else(\|_\| Some(empty_song.clone()))
	58	+	.unwrap_or_else(\|\| empty_song);
56	59		Ok(Self {
57	60		conn,
58	61		songs_filenames,
		@@ -93,8 +96,12 @@ impl Connection {
93	96		/// Update status
94	97		pub fn update_status(&mut self) {
95	98		let status = self.conn.status().unwrap();
96		−	let empty_song = self.get_song_with_only_filename("No Song in the Queue");
97		−	let current_song = self.conn.currentsong().unwrap_or_else(\|_\| Some(empty_song.clone())).unwrap_or_else(\|\| empty_song);
	99	+	let empty_song = self.get_song_with_only_filename("No Song playing or in Queue");
	100	+	let current_song = self
	101	+	.conn
	102	+	.currentsong()
	103	+	.unwrap_or_else(\|_\| Some(empty_song.clone()))
	104	+	.unwrap_or_else(\|\| empty_song);
98	105
99	106		// Playback State
100	107		match status.state {

		@@ -1,5 +1,4 @@
1	1		use crate::app::{App, SelectedTab};
2		−	use clap::builder::styling::RgbColor;
3	2		use ratatui::{
4	3		prelude::*,
5	4		widgets::{block::Title, *},