workaround for #7, fix error when using 'Space'

This commit is contained in:
krolxon 2024-05-30 16:36:04 +05:30
parent 6ae0aca868
commit 7b14b68164
1 changed files with 12 additions and 11 deletions

View File

@ -1,6 +1,6 @@
use std::time::Duration;
use std::{path::Path, time::Duration};
use crate::browser::FileBrowser;
use crate::browser::{FileBrowser, FileExtension};
use crate::connection::Connection;
use crate::list::ContentList;
use crate::ui::InputMode;
@ -117,16 +117,17 @@ impl App {
let songs = self.conn.conn.listfiles(&file).unwrap_or_default();
for (t, f) in songs.iter() {
if t == "file" {
let path = self.browser.prev_path.to_string()
+ "/"
+ self.browser.path.as_str()
+ "/"
+ f;
if Path::new(&f).has_extension(&[
"mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape", "wma",
"mpc", "aiff", "dff", "mp2", "mka",
]) {
let path = file.clone() + "/" + f;
let full_path = path.strip_prefix("./").unwrap_or_else(|| "");
let song = self.conn.get_song_with_only_filename(full_path);
let song = self.conn.get_song_with_only_filename(&full_path);
self.conn.conn.push(&song)?;
}
}
}
} else if content_type == "file" {
let mut status = false;
for (i, song) in self.queue_list.list.clone().iter().enumerate() {
@ -143,7 +144,7 @@ impl App {
+ self.browser.path.as_str()
+ "/"
+ content;
let full_path = path.strip_prefix("./").unwrap_or_else(|| "");
let full_path = path.strip_prefix("././").unwrap_or_else(|| "");
let song = self.conn.get_song_with_only_filename(full_path);
self.conn.conn.push(&song)?;