Commit aca208e

rmptuiaca208e

pl_append functionality for playlists

Author: krolxon
Date: 2024-05-13 14:33 +0530
Parent: 9bdc76b
Commit: aca208e0d843a43779cac565581bed620f2b08cd

+27 −8

4 files changed

Browse files Patch

−Context 3+

M src/event/pl_append_keys.rs +20 −6
M src/event/pl_rename_keys.rs +1 −1
M src/list.rs +5 −0
M src/ui.rs +1 −1

M src/event/pl_append_keys.rs View

M src/event/pl_rename_keys.rs View

M src/list.rs View

M src/ui.rs View

		@@ -13,14 +13,12 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()>
13	13		KeyCode::Char('k') \| KeyCode::Up => app.append_list.prev(),
14	14
15	15		KeyCode::Enter => {
16		−	let pl_index = app.append_list.index;
17		−	let pl_name = &app.append_list.list.get(pl_index).unwrap();
	16	+	// name of highlighted playlist in append list
	17	+	let pl_name = &app.append_list.get_item_at_current_index();
18	18
19		−	let s_index: usize;
20	19		match app.selected_tab {
21	20		SelectedTab::Queue => {
22		−	s_index = app.queue_list.index;
23		−	let short_path = &app.queue_list.list.get(s_index).unwrap().file;
	21	+	let short_path = &app.queue_list.get_item_at_current_index().file;
24	22
25	23		if let Some(full_path) = app.conn.get_full_path(short_path) {
26	24		let song = app.conn.get_song_with_only_filename(&full_path);
		@@ -68,7 +66,23 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()>
68	66		}
69	67		}
70	68		}
71		−	_ => {}
	69	+
	70	+	SelectedTab::Playlists => {
	71	+	let playlist_name = app.pl_list.get_item_at_current_index();
	72	+	if *pl_name == "Current Playlist" {
	73	+	app.conn.load_playlist(playlist_name)?;
	74	+	app.update_queue();
	75	+	} else {
	76	+	let songs = app.conn.conn.playlist(playlist_name)?;
	77	+	for song in songs {
	78	+	// We ignore the Err() since there could be songs in playlists, which do not exist in the db anymore.
	79	+	// So instead of panicking, we just ignore if the song does not exists
	80	+	app.conn
	81	+	.add_to_playlist(*pl_name, &song)
	82	+	.unwrap_or_else(\|_\| {});
	83	+	}
	84	+	}
	85	+	}
72	86		}
73	87
74	88		// hide the playlist popup

		@@ -16,7 +16,7 @@ pub fn handle_pl_rename_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()
16	16		}
17	17		KeyCode::Enter => {
18	18		app.conn.conn.pl_rename(
19		−	app.pl_list.list.get(app.pl_list.index).unwrap(),
	19	+	app.pl_list.get_item_at_current_index(),
20	20		&app.pl_newname_input,
21	21		)?;
22	22		app.pl_list.list = App::get_playlist(&mut app.conn.conn)?;

		@@ -30,6 +30,11 @@ impl<T> ContentList<T> {
30	30		pub fn reset_index(&mut self) {
31	31		self.index = 0;
32	32		}
	33	+
	34	+	/// Returns the self.list[index] item
	35	+	pub fn get_item_at_current_index(&mut self) -> &T {
	36	+	self.list.get(self.index).unwrap()
	37	+	}
33	38		}
34	39
35	40		impl<T> Default for ContentList<T> {

		@@ -355,7 +355,7 @@ fn draw_playlist_viewer(frame: &mut Frame, app: &mut App, area: Rect) {
355	355		return;
356	356		}
357	357
358		−	let pl_name = app.pl_list.list.get(app.pl_list.index).unwrap();
	358	+	let pl_name = app.pl_list.get_item_at_current_index();
359	359		let songs = app.conn.conn.playlist(pl_name).unwrap();
360	360		let rows = songs.iter().map(\|song\| {
361	361		let title = song.clone().title.unwrap_or_default().cyan();

rmptui/aca208e

pl_append functionality for playlists

rmptuiaca208e