Commit 6e631a0

rmptui6e631a0

add unadded songs to queue on <space>

+28 −15

3 files changed

−Context 3+

M src/app.rs View

M src/handler.rs View

M src/ui.rs View

		@@ -114,34 +114,47 @@ impl App {
114	114		Ok(())
115	115		}
116	116
117		−	pub fn remove_from_current_playlist(&mut self) {
118		−	let mut file = String::new();
	117	+	pub fn handle_remove_or_from_current_playlist(&mut self) -> AppResult<()> {
119	118		match self.selected_tab {
120	119		SelectedTab::DirectoryBrowser => {
121		−	let (_, f) = self.browser.filetree.get(self.browser.selected).unwrap();
122		−	file.push_str(f);
	120	+	let (_, file) = self.browser.filetree.get(self.browser.selected).unwrap();
123	121		self.browser.selected += 1;
	122	+	let mut status = false;
	123	+	for (i, song) in self.queue_list.list.clone().iter().enumerate() {
	124	+	if song.contains(file) {
	125	+	self.conn.conn.delete(i as u32).unwrap();
	126	+	status = true;
	127	+	}
	128	+	}
	129	+
	130	+	if !status {
	131	+	let song = self
	132	+	.conn
	133	+	.get_song_with_only_filename(&self.conn.get_full_path(&file).unwrap());
	134	+	self.conn.conn.push(&song)?;
	135	+	}
124	136		}
125	137
126	138		SelectedTab::Queue => {
127		−	file = self
	139	+	let file = self
128	140		.queue_list
129	141		.list
130	142		.get(self.queue_list.index)
131	143		.unwrap()
132	144		.to_string();
	145	+
	146	+	for (i, song) in self.queue_list.list.clone().iter().enumerate() {
	147	+	if song.contains(&file) {
	148	+	self.conn.conn.delete(i as u32).unwrap();
	149	+	}
	150	+	}
133	151		}
134	152
135	153		_ => {}
136	154		}
137	155
138		−	for (i, song) in self.queue_list.list.clone().iter().enumerate() {
139		−	if song.contains(&file) {
140		−	self.conn.conn.delete(i as u32).unwrap();
141		−	}
142		−	}
143		−
144	156		self.update_queue();
	157	+	Ok(())
145	158		}
146	159
147	160		pub fn cycle_tabls(&mut self) {

		@@ -323,7 +323,7 @@ pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
323	323
324	324		// Remove from Current Playlsit
325	325		KeyCode::Char(' ') \| KeyCode::Backspace => {
326		−	app.remove_from_current_playlist();
	326	+	app.handle_remove_or_from_current_playlist()?;
327	327		}
328	328
329	329		// Change playlist name

		@@ -62,9 +62,9 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
62	62		}
63	63		}
64	64		if status {
65		−	list.push(ListItem::new(s.clone().bold()));
	65	+	list.push(ListItem::new(s.clone().magenta().bold()));
66	66		} else {
67		−	list.push(ListItem::new(Line::styled(s, Style::default())));
	67	+	list.push(ListItem::new(s.clone()));
68	68		}
69	69		} else {
70	70		list.push(ListItem::new(Line::styled(
		@@ -115,7 +115,7 @@ fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
115	115		let mut items: Vec<ListItem> = vec![];
116	116		for item in app.queue_list.list.iter() {
117	117		if item.contains(&app.conn.current_song.file) {
118		−	items.push(ListItem::new(item.clone().bold()))
	118	+	items.push(ListItem::new(item.clone().magenta().bold()))
119	119		} else {
120	120		items.push(ListItem::new(item.clone()));
121	121		}