krolyxon
/
rmptui
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove use of contains()

This commit is contained in:
krolxon 2024-05-16 18:24:18 +05:30
parent 35db5fb07d
commit bcec798632
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app.rs
View File

@ -114,7 +114,8 @@ impl App {
let mut status = false; let mut status = false;
for (i, song) in self.queue_list.list.clone().iter().enumerate() { 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(); self.conn.conn.delete(i as u32).unwrap();
status = true; status = true;
} }
@ -145,7 +146,7 @@ impl App {
.to_string(); .to_string();
for (i, song) in self.queue_list.list.clone().iter().enumerate() { 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(); self.conn.conn.delete(i as u32).unwrap();
if self.queue_list.index == self.queue_list.list.len() - 1 if self.queue_list.index == self.queue_list.list.len() - 1
&& self.queue_list.index != 0 && self.queue_list.index != 0
@ -186,14 +187,10 @@ impl App {
browser.selected = 0; browser.selected = 0;
} }
} else { } else {
let index = self let index = self.queue_list.list.iter().position(|x| {
.queue_list let file = x.file.split("/").last().unwrap_or_default();
.list file.eq(path)
.iter() });
.position(|x| {
let file = x.file.split("/").last().unwrap();
file.eq(path)
});
if index.is_some() { if index.is_some() {
self.conn.conn.switch(index.unwrap() as u32)?; self.conn.conn.switch(index.unwrap() as u32)?;

2
src/ui.rs
View File

@ -76,7 +76,7 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
let mut status: bool = false; let mut status: bool = false;
for sn in app.queue_list.list.iter() { 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) { if file.eq(s) {
status = true; status = true;
} }