Commit ec169d0

rmptuiec169d0

remove use of contains()

+8 −11

2 files changed

−Context 3+

M src/app.rs View

M src/ui.rs View

		@@ -114,7 +114,8 @@ impl App {
114	114
115	115		let mut status = false;
116	116		for (i, song) in self.queue_list.list.clone().iter().enumerate() {
117		−	if song.file.contains(file) {
	117	+	let song_path = song.file.split("/").last().unwrap_or_default();
	118	+	if song_path.eq(file) {
118	119		self.conn.conn.delete(i as u32).unwrap();
119	120		status = true;
120	121		}
		@@ -145,7 +146,7 @@ impl App {
145	146		.to_string();
146	147
147	148		for (i, song) in self.queue_list.list.clone().iter().enumerate() {
148		−	if song.file.contains(&file) {
	149	+	if song.file.eq(&file) {
149	150		self.conn.conn.delete(i as u32).unwrap();
150	151		if self.queue_list.index == self.queue_list.list.len() - 1
151	152		&& self.queue_list.index != 0
		@@ -186,14 +187,10 @@ impl App {
186	187		browser.selected = 0;
187	188		}
188	189		} else {
189		−	let index = self
190		−	.queue_list
191		−	.list
192		−	.iter()
193		−	.position(\|x\| {
194		−	let file = x.file.split("/").last().unwrap();
195		−	file.eq(path)
196		−	});
	190	+	let index = self.queue_list.list.iter().position(\|x\| {
	191	+	let file = x.file.split("/").last().unwrap_or_default();
	192	+	file.eq(path)
	193	+	});
197	194
198	195		if index.is_some() {
199	196		self.conn.conn.switch(index.unwrap() as u32)?;

		@@ -76,7 +76,7 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
76	76
77	77		let mut status: bool = false;
78	78		for sn in app.queue_list.list.iter() {
79		−	let file = sn.file.split("/").last().unwrap();
	79	+	let file = sn.file.split("/").last().unwrap_or_default();
80	80		if file.eq(s) {
81	81		status = true;
82	82		}