remove use of contains()
This commit is contained in:
parent
35db5fb07d
commit
bcec798632
13
src/app.rs
13
src/app.rs
|
|
@ -114,7 +114,8 @@ impl App {
|
|||
|
||||
let mut status = false;
|
||||
for (i, song) in self.queue_list.list.clone().iter().enumerate() {
|
||||
if song.file.contains(file) {
|
||||
let song_path = song.file.split("/").last().unwrap_or_default();
|
||||
if song_path.eq(file) {
|
||||
self.conn.conn.delete(i as u32).unwrap();
|
||||
status = true;
|
||||
}
|
||||
|
|
@ -145,7 +146,7 @@ impl App {
|
|||
.to_string();
|
||||
|
||||
for (i, song) in self.queue_list.list.clone().iter().enumerate() {
|
||||
if song.file.contains(&file) {
|
||||
if song.file.eq(&file) {
|
||||
self.conn.conn.delete(i as u32).unwrap();
|
||||
if self.queue_list.index == self.queue_list.list.len() - 1
|
||||
&& self.queue_list.index != 0
|
||||
|
|
@ -186,12 +187,8 @@ impl App {
|
|||
browser.selected = 0;
|
||||
}
|
||||
} else {
|
||||
let index = self
|
||||
.queue_list
|
||||
.list
|
||||
.iter()
|
||||
.position(|x| {
|
||||
let file = x.file.split("/").last().unwrap();
|
||||
let index = self.queue_list.list.iter().position(|x| {
|
||||
let file = x.file.split("/").last().unwrap_or_default();
|
||||
file.eq(path)
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
|
|||
|
||||
let mut status: bool = false;
|
||||
for sn in app.queue_list.list.iter() {
|
||||
let file = sn.file.split("/").last().unwrap();
|
||||
let file = sn.file.split("/").last().unwrap_or_default();
|
||||
if file.eq(s) {
|
||||
status = true;
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue