Commit a816152

rmptuia816152

add keymaps to readme.md and minor changes

Author: krolxon
Date: 2024-04-25 15:51 +0530
Parent: 00c5c12
Commit: a8161521d099c8add12b54db519c74f976e2a55c

+76 −95

6 files changed

Browse files Patch

−Context 3+

M README.md +21 −1
M src/app.rs +1 −1
M src/browser.rs +0 −2
M src/connection.rs +8 −2
M src/handler.rs +6 −11
M src/ui.rs +40 −78

M README.md View

M src/app.rs View

M src/browser.rs View

M src/connection.rs View

M src/handler.rs View

M src/ui.rs View

		@@ -1,4 +1,24 @@
1	1		A MPD client in Rust
2	2
3		−	# Keys
	3	+	### Keys
	4	+	- 'q' OR 'Ctr+C' to quit
	5	+	- 'p' to toggle pause
	6	+	- '+' to increase volume
	7	+	- '-' to decrease volume
	8	+	- 'D' to get dmenu prompt
	9	+	- 'j' to scroll down
	10	+	- 'k' to scroll up
	11	+	- 'l' add song to playlist or go inside the directory
	12	+	- 'h' to go back to previous directory
	13	+	- `Tab` to cycle through tabs
	14	+	- '1' to go to directory tree
	15	+	- '2' to go to current playing queue
	16	+	- '3' to go to playlists view
	17	+	- 'Enter' to add song/playlist to current playlist
	18	+	- 'a' to append the song to current playing queue
	19	+	- 'f' to go forward
	20	+	- 'b' to go backwords
	21	+	- '>' to play next song from queue
	22	+	- '<' to play previous song from queue
	23	+	- 'U' to update the MPD database
4	24

		@@ -65,6 +65,7 @@ impl App {
65	65		pub fn tick(&mut self) {
66	66		self.conn.update_state();
67	67		self.conn.update_progress();
	68	+	self.conn.update_volume();
68	69		self.update_queue();
69	70		self.browser.update_directory(&mut self.conn).unwrap();
70	71		}
		@@ -97,7 +98,6 @@ impl App {
97	98
98	99		pub fn get_playlist(conn: &mut Client) -> AppResult<Vec<String>> {
99	100		let list: Vec<String> = conn.playlists()?.iter().map(\|p\| p.clone().name).collect();
100		−
101	101		Ok(list)
102	102		}
103	103

		@@ -1,5 +1,3 @@
1		−	use mpd::Query;
2		−
3	1		use crate::{app::AppResult, connection::Connection};
4	2
5	3		#[derive(Debug)]

		@@ -14,6 +14,7 @@ pub struct Connection {
14	14		pub state: String,
15	15		pub elapsed: Duration,
16	16		pub total_duration: Duration,
	17	+	pub volume: u8,
17	18		}
18	19
19	20		impl Connection {
		@@ -26,8 +27,8 @@ impl Connection {
26	27		.into_iter()
27	28		.map(\|x\| x.file)
28	29		.collect();
29		−
30	30		let (elapsed, total) = conn.status().unwrap().time.unwrap_or_default();
	31	+	let volume: u8 = conn.status().unwrap_or_default().volume as u8;
31	32
32	33		Ok(Self {
33	34		conn,
		@@ -35,6 +36,7 @@ impl Connection {
35	36		state: "Stopped".to_string(),
36	37		elapsed,
37	38		total_duration: total,
	39	+	volume,
38	40		})
39	41		}
40	42
		@@ -77,6 +79,10 @@ impl Connection {
77	79		self.total_duration = total;
78	80		}
79	81
	82	+	pub fn update_volume(&mut self) {
	83	+	self.volume = self.conn.status().unwrap_or_default().volume as u8;
	84	+	}
	85	+
80	86		pub fn get_progress_ratio(&self) -> f64 {
81	87		let total = self.total_duration.as_secs_f64();
82	88		if total == 0.0 {
		@@ -84,7 +90,7 @@ impl Connection {
84	90		} else {
85	91		let ratio = self.elapsed.as_secs_f64() / self.total_duration.as_secs_f64();
86	92		if ratio > 1.0 \|\| ratio == 0.0 {
87		−	1.0
	93	+	0.0
88	94		} else {
89	95		ratio
90	96		}

		@@ -2,8 +2,6 @@ use std::time::Duration;
2	2
3	3		use crate::app::{App, AppResult, SelectedTab};
4	4		use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
5		−	use mpd::{Query, Term};
6		−	use ratatui::style::Modifier;
7	5		use rust_fuzzy_search;
8	6		use simple_dmenu::dmenu;
9	7
		@@ -13,6 +11,8 @@ pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
13	11		KeyCode::Char('c') \| KeyCode::Char('C') => {
14	12		if key_event.modifiers == KeyModifiers::CONTROL {
15	13		app.quit();
	14	+	} else {
	15	+	app.conn.conn.clear()?;
16	16		}
17	17		}
18	18
		@@ -68,12 +68,6 @@ pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
68	68		app.conn.pause();
69	69		}
70	70
71		−	// Clear Queue
72		−	KeyCode::Char('x') => {
73		−	app.conn.conn.clear()?;
74		−	// app.update_queue();
75		−	}
76		−
77	71		// Dmenu prompt
78	72		KeyCode::Char('D') => {
79	73		app.conn.play_dmenu()?;
		@@ -122,22 +116,23 @@ pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
122	116		app.selected_tab = SelectedTab::Playlists;
123	117		}
124	118
125		−
126		−	KeyCode::Char('n') => {
	119	+	KeyCode::Char('>') => {
127	120		app.conn.conn.next()?;
128	121		}
129	122
130		−	KeyCode::Char('N') => {
	123	+	KeyCode::Char('<') => {
131	124		app.conn.conn.prev()?;
132	125		}
133	126
134	127		// Volume controls
135	128		KeyCode::Char('=') => {
136	129		app.conn.inc_volume(2);
	130	+	app.conn.update_volume();
137	131		}
138	132
139	133		KeyCode::Char('-') => {
140	134		app.conn.dec_volume(2);
	135	+	app.conn.update_volume();
141	136		}
142	137
143	138		// Delete highlighted song from the queue

		@@ -1,7 +1,4 @@
1		−	use crate::{
2		−	app::{App, AppResult, SelectedTab},
3		−	browser::FileBrowser,
4		−	};
	1	+	use crate::app::{App, SelectedTab};
5	2		use ratatui::{
6	3		prelude::*,
7	4		widgets::{block::Title, *},
		@@ -17,73 +14,62 @@ pub fn render(app: &mut App, frame: &mut Frame) {
17	14		// Layout
18	15		let layout = Layout::default()
19	16		.direction(Direction::Vertical)
20		−	.constraints(vec![
21		−	Constraint::Percentage(0),
22		−	// Constraint::Percentage(88),
23		−	Constraint::Percentage(93),
24		−	Constraint::Percentage(7),
25		−	])
	17	+	.constraints(vec![Constraint::Percentage(93), Constraint::Percentage(7)])
26	18		.split(frame.size());
27		−	//
28		−	// let outer_layout = Layout::default()
29		−	// .direction(Direction::Horizontal)
30		−	// .constraints(vec![Constraint::Percentage(50), Constraint::Percentage(50)])
31		−	// .split(main_layout[1]);
32		−	//
33		−	// let inner_layout = Layout::default()
34		−	// .direction(Direction::Vertical)
35		−	// .constraints(vec![Constraint::Percentage(50), Constraint::Percentage(50)])
36		−	// .split(outer_layout[1]);
37		−
38		−	// draw_song_list(frame, app, outer_layout[0]);
39		−	// draw_queue(frame, app, inner_layout[0]);
40		−	// draw_playlists(frame, app, inner_layout[1]);
41		−	draw_progress_bar(frame, app, layout[2]);
42		−
43		−	// let highlight_style = (Color::default(), tailwind::YELLOW.c700);
44		−	// let tab = Tabs::new(vec!["Songs List", "Play Queue", "Playlists"])
45		−	// .block(Block::default().title("Tabs").borders(Borders::ALL))
46		−	// .style(Style::default().white())
47		−	// .highlight_style(highlight_style)
48		−	// .divider(" ")
49		−	// .select(app.selected_tab.clone() as usize)
50		−	// .padding("", "");
51		−	// frame.render_widget(tab, layout[0]);
52	19
53	20		match app.selected_tab {
54		−	// SelectedTab::SongList => draw_song_list(frame, app, layout[1]),
55		−	SelectedTab::Queue => draw_queue(frame, app, layout[1]),
56		−	SelectedTab::Playlists => draw_playlists(frame, app, layout[1]),
57		−	SelectedTab::DirectoryBrowser => draw_directory_browser(frame, app, layout[1]),
	21	+	SelectedTab::Queue => draw_queue(frame, app, layout[0]),
	22	+	SelectedTab::Playlists => draw_playlists(frame, app, layout[0]),
	23	+	SelectedTab::DirectoryBrowser => draw_directory_browser(frame, app, layout[0]),
58	24		}
	25	+
	26	+	draw_progress_bar(frame, app, layout[1]);
59	27		}
60	28
61		−	/// draws list of songs
62		−	fn draw_song_list(frame: &mut Frame, app: &mut App, size: Rect) {
	29	+	/// Draws the file tree browser
	30	+	fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
63	31		let mut song_state = ListState::default();
64	32		let total_songs = app.conn.conn.stats().unwrap().songs.to_string();
65		−	let list = List::new(app.conn.songs_filenames.clone())
	33	+	let mut list: Vec<String> = vec![];
	34	+	for (t, s) in app.browser.filetree.iter() {
	35	+	if t == "file" {
	36	+	list.push(s.to_string());
	37	+	} else {
	38	+	list.push(format!("[{}]", *s));
	39	+	}
	40	+	}
	41	+	let list = List::new(list)
66	42		.block(
67	43		Block::default()
68		−	.title("Song List".green().bold())
	44	+	.title(format!("File Browser: {}", app.browser.path.clone()).bold())
69	45		.title(
70	46		Title::from(format!("Total Songs: {}", total_songs).bold().green())
	47	+	.alignment(Alignment::Center),
	48	+	)
	49	+	.title(
	50	+	Title::from(format!("Volume: {}%", app.conn.volume).bold().green())
71	51		.alignment(Alignment::Right),
72	52		)
73	53		.borders(Borders::ALL),
74	54		)
75	55		.highlight_style(Style::new().add_modifier(Modifier::REVERSED))
76	56		.highlight_symbol(">>")
77		−	.repeat_highlight_symbol(true);
	57	+	.repeat_highlight_symbol(true)
	58	+	.scroll_padding(20);
78	59
79		−	song_state.select(Some(app.song_list.index));
	60	+	song_state.select(Some(app.browser.selected));
80	61		frame.render_stateful_widget(list, size, &mut song_state);
81	62		}
82	63
83	64		/// draws playing queue
84	65		fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
85	66		let mut queue_state = ListState::default();
86		−	let title = Block::default().title(Title::from("Play Queue".green().bold()));
	67	+	let title = Block::default()
	68	+	.title(Title::from("Play Queue".green().bold()))
	69	+	.title(
	70	+	Title::from(format!("Volume: {}%", app.conn.volume).bold().green())
	71	+	.alignment(Alignment::Right),
	72	+	);
87	73		let list = List::new(app.queue_list.list.clone())
88	74		.block(title.borders(Borders::ALL))
89	75		.highlight_style(Style::new().add_modifier(Modifier::REVERSED))
		@@ -98,7 +84,13 @@ fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
98	84		fn draw_playlists(frame: &mut Frame, app: &mut App, size: Rect) {
99	85		let mut state = ListState::default();
100	86
101		−	let title = Block::default().title(Title::from("Playlist".green().bold()));
	87	+	let title = Block::default()
	88	+	.title(Title::from("Playlist".green().bold()))
	89	+	.title(
	90	+	Title::from(format!("Volume: {}%", app.conn.volume).bold().green())
	91	+	.alignment(Alignment::Right),
	92	+	);
	93	+
102	94		let list = List::new(app.pl_list.list.clone())
103	95		.block(title.borders(Borders::ALL))
104	96		.highlight_style(Style::new().add_modifier(Modifier::REVERSED))
		@@ -109,7 +101,7 @@ fn draw_playlists(frame: &mut Frame, app: &mut App, size: Rect) {
109	101		frame.render_stateful_widget(list, size, &mut state);
110	102		}
111	103
112		−	// Progress Bar
	104	+	/// Draws Progress Bar
113	105		fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
114	106		let song = app
115	107		.conn
		@@ -151,33 +143,3 @@ fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
151	143
152	144		frame.render_widget(progress_bar, size);
153	145		}
154		−
155		−	fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
156		−	let mut song_state = ListState::default();
157		−	let total_songs = app.conn.conn.stats().unwrap().songs.to_string();
158		−	let mut list: Vec<String> = vec![];
159		−	for (t, s) in app.browser.filetree.iter() {
160		−	if t == "file" {
161		−	list.push(s.to_string());
162		−	} else {
163		−	list.push(format!("[{}]", *s));
164		−	}
165		−	}
166		−	let list = List::new(list)
167		−	.block(
168		−	Block::default()
169		−	.title(format!("File Browser: {}", app.browser.path.clone()).bold())
170		−	.title(
171		−	Title::from(format!("Total Songs: {}", total_songs).bold().green())
172		−	.alignment(Alignment::Right),
173		−	)
174		−	.borders(Borders::ALL),
175		−	)
176		−	.highlight_style(Style::new().add_modifier(Modifier::REVERSED))
177		−	.highlight_symbol(">>")
178		−	.repeat_highlight_symbol(true)
179		−	.scroll_padding(20);
180		−
181		−	song_state.select(Some(app.browser.selected));
182		−	frame.render_stateful_widget(list, size, &mut song_state);
183		−	}

rmptui/a816152

add keymaps to readme.md and minor changes

rmptuia816152