From 0f52d10198687b9c888fe5a1136cfb5b17306786 Mon Sep 17 00:00:00 2001
From: "alterwain@protonmail.com" <alterwain@protonmail.com>
Date: Fri, 7 Mar 2025 15:48:34 +0300
Subject: [PATCH] File system move to parent directory fix

---
 src/file_system.rs | 60 ++++++++++++++++++++++++++--------------------
 src/sync.rs        |  6 +++++
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/file_system.rs b/src/file_system.rs
index fd1c12d..135ebe4 100644
--- a/src/file_system.rs
+++ b/src/file_system.rs
@@ -85,7 +85,6 @@ impl AppScreen for FileSystem {
             }
             KeyCode::F(5) => self.download_as_is(),
             KeyCode::F(6) => self.download_as_playlist(),
-            KeyCode::Tab => self.move_up(),
             KeyCode::Enter => self.enter_directory(),
             _ => {}
         }
@@ -104,8 +103,6 @@ impl AppScreen for FileSystem {
 
         // Render Status Bar
         let status_bar = Paragraph::new(Line::from(vec![
-            "<TAB> MOVE UP".bold(),
-            " | ".dark_gray(),
             "<F4> SWITCH TO NORMAL".bold(),
             " | ".dark_gray(),
             "<F5> SAVE AS IS".bold(),
@@ -195,6 +192,8 @@ impl FileSystem {
             })
             .collect::<Vec<Vec<String>>>();
 
+        let data = [vec![vec![String::from("..")]], data].concat();
+
         self.files = dir;
 
         self.table.set_data(data);
@@ -203,29 +202,33 @@ impl FileSystem {
     }
 
     fn download_as_is(&self) {
-        let entry = self.files.get(self.table.selected_row()).unwrap();
-        if entry.path().is_dir() {
-            let files = list_files_recursively(entry.path());
-            let _ = self.sender.send(AppEvent::LoadFromFSVec(files));
-        } else {
-            let _ = self.sender.send(AppEvent::LoadFromFS(entry.path()));
+        if let 1.. = self.table.selected_row() {
+            let entry = self.files.get(self.table.selected_row() - 1).unwrap();
+            if entry.path().is_dir() {
+                let files = list_files_recursively(entry.path());
+                let _ = self.sender.send(AppEvent::LoadFromFSVec(files));
+            } else {
+                let _ = self.sender.send(AppEvent::LoadFromFS(entry.path()));
+            }
         }
     }
 
     fn download_as_playlist(&self) {
-        let entry = self.files.get(self.table.selected_row()).unwrap();
-        if entry.path().is_dir() {
-            let files = list_files_recursively(entry.path());
-            let _ = self.sender.send(AppEvent::LoadFromFSPL((
-                files,
-                entry
-                    .path()
-                    .file_name()
-                    .unwrap()
-                    .to_str()
-                    .unwrap()
-                    .to_string(),
-            )));
+        if let 1.. = self.table.selected_row() {
+            let entry = self.files.get(self.table.selected_row() - 1).unwrap();
+            if entry.path().is_dir() {
+                let files = list_files_recursively(entry.path());
+                let _ = self.sender.send(AppEvent::LoadFromFSPL((
+                    files,
+                    entry
+                        .path()
+                        .file_name()
+                        .unwrap()
+                        .to_str()
+                        .unwrap()
+                        .to_string(),
+                )));
+            }
         }
     }
 
@@ -239,11 +242,16 @@ impl FileSystem {
     }
 
     fn enter_directory(&mut self) {
-        let entry = self.files.get(self.table.selected_row()).unwrap();
-        if !entry.path().is_dir() {
-            return;
+        match self.table.selected_row() {
+            0 => self.move_up(),
+            _ => {
+                let entry = self.files.get(self.table.selected_row() - 1).unwrap();
+                if !entry.path().is_dir() {
+                    return;
+                }
+                self.get_path(entry.path());
+            }
         }
-        self.get_path(entry.path());
     }
 
     fn render_main(&self, frame: &mut Frame, area: Rect) {
diff --git a/src/sync.rs b/src/sync.rs
index 5369b20..a393ed4 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -288,6 +288,9 @@ pub fn initialize_async_service(
                             AppEvent::DownloadYTPlaylist(ytplaylist) => { download_youtube_playlist(ytplaylist, database.as_mut().unwrap(), &sender, ipod_db.clone().unwrap()).await; },
                             AppEvent::SwitchScreen(state) => { let _ = sender.send(AppEvent::SwitchScreen(state)).await;},
                             AppEvent::LoadFromFS(path) => {
+                                let _ = sender
+                                        .send(AppEvent::SwitchScreen(AppState::LoadingScreen))
+                                        .await;
                                 load_from_fs(path, database.as_mut().unwrap(), &sender, ipod_db.clone().unwrap()).await;
                                     let _ = sender
                                         .send(AppEvent::SwitchScreen(AppState::FileSystem))
@@ -454,6 +457,9 @@ async fn load_files_from_fs(
     sender: &Sender<AppEvent>,
     ipod_path: String,
 ) {
+    let _ = sender
+        .send(AppEvent::SwitchScreen(AppState::LoadingScreen))
+        .await;
     for (i, file) in files.iter().enumerate() {
         let _ = sender
             .send(AppEvent::OverallProgress((