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

workaround for #7

This commit is contained in:
krolxon 2024-05-25 11:09:54 +05:30
parent 48fd5a7508
commit b31e16554c
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app.rs
View File

@ -117,10 +117,14 @@ impl App {
let songs = self.conn.conn.listfiles(&file).unwrap_or_default(); let songs = self.conn.conn.listfiles(&file).unwrap_or_default();
for (t, f) in songs.iter() { for (t, f) in songs.iter() {
if t == "file" { if t == "file" {
if let Some(full_path) = &self.conn.get_full_path(f) { let path = self.browser.prev_path.to_string()
let song = self.conn.get_song_with_only_filename(full_path); + "/"
self.conn.conn.push(&song)?; + self.browser.path.as_str()
} + "/"
+ f;
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)?;
} }
} }
} else if content_type == "file" { } else if content_type == "file" {
@ -134,10 +138,15 @@ impl App {
} }
if !status { if !status {
if let Some(full_path) = &self.conn.get_full_path(content) { let path = self.browser.prev_path.to_string()
let song = self.conn.get_song_with_only_filename(full_path); + "/"
self.conn.conn.push(&song)?; + self.browser.path.as_str()
} + "/"
+ content;
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)?;
} }
} }

7
src/browser.rs
View File

@ -89,9 +89,10 @@ impl FileBrowser {
let v = conn let v = conn
.conn .conn
.lsinfo(Song { .lsinfo(Song {
file: conn file: (self.path.clone() + "/" + song)
.get_full_path(song) .strip_prefix("./")
.unwrap_or_else(|| "Not a song".to_string()), .unwrap_or_else(|| "")
.to_string(),
..Default::default() ..Default::default()
}) })
.unwrap_or_else(|_| { .unwrap_or_else(|_| {