fix #4
This commit is contained in:
parent
1e02da68cc
commit
bb5bcea3ff
21
src/app.rs
21
src/app.rs
|
|
@ -194,15 +194,6 @@ impl App {
|
|||
browser.selected = 0;
|
||||
}
|
||||
} else {
|
||||
// let list = conn
|
||||
// .songs_filenames
|
||||
// .iter()
|
||||
// .map(|f| f.as_str())
|
||||
// .collect::<Vec<&str>>();
|
||||
// let (filename, _) = rust_fuzzy_search::fuzzy_search_sorted(&path, &list)
|
||||
// .get(0)
|
||||
// .unwrap()
|
||||
// .clone();
|
||||
let index = self
|
||||
.queue_list
|
||||
.list
|
||||
|
|
@ -212,12 +203,14 @@ impl App {
|
|||
if index.is_some() {
|
||||
self.conn.conn.switch(index.unwrap() as u32)?;
|
||||
} else {
|
||||
for filename in self.conn.songs_filenames.clone().iter() {
|
||||
if filename.contains(path) {
|
||||
let song = self.conn.get_song_with_only_filename(filename);
|
||||
let mut filename = format!("{}/{}", browser.path, path);
|
||||
|
||||
// Remove "./" from the beginning of filename
|
||||
filename.remove(0);
|
||||
filename.remove(0);
|
||||
|
||||
let song = self.conn.get_song_with_only_filename(&filename);
|
||||
self.conn.push(&song)?;
|
||||
}
|
||||
}
|
||||
|
||||
// updating queue, to avoid multiple pushes of the same songs if we enter multiple times before the queue gets updated
|
||||
self.update_queue();
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
use ratatui::prelude::*;
|
||||
use rmptui::app::App;
|
||||
use rmptui::app::AppResult;
|
||||
use rmptui::event::event::Event;
|
||||
|
|
@ -6,10 +7,6 @@ use rmptui::event::handler;
|
|||
use rmptui::tui;
|
||||
use std::env;
|
||||
use std::io;
|
||||
use ratatui::prelude::*;
|
||||
|
||||
pub type Result<T> = core::result::Result<T, Error>;
|
||||
pub type Error = Box<dyn std::error::Error>;
|
||||
|
||||
fn main() -> AppResult<()> {
|
||||
// Connection
|
||||
|
|
@ -26,7 +23,7 @@ fn main() -> AppResult<()> {
|
|||
tui.init()?;
|
||||
|
||||
// initial directory read
|
||||
app.browser.update_directory(&mut app.conn).unwrap();
|
||||
app.browser.update_directory(&mut app.conn)?;
|
||||
|
||||
while app.running {
|
||||
tui.draw(&mut app)?;
|
||||
|
|
|
|||
Reference in New Issue