refactor previewing

 - remove dependency on preview.rs in commands/
 - now can just call tab.refresh_preview to update the preview

1 files changed, 102 insertions, 54 deletions

diff --git a/src/preview.rs b/src/preview.rs
index 2dbf21c..48c045a 100644
--- a/src/preview.rs
+++ b/src/preview.rs
@@ -1,77 +1,125 @@
-use std::path::PathBuf;
-use std::process;
+use std::collections::hash_map::Entry;
+
+// use std::process;
 
 use crate::config::JoshutoConfig;
+use crate::structs::{JoshutoDirEntry, JoshutoDirList};
 use crate::tab::JoshutoTab;
-use crate::ui;
-use crate::window::{panel::JoshutoPanel, view::JoshutoView};
+use crate::window::panel::JoshutoPanel;
+
+pub fn preview_parent(curr_tab: &mut JoshutoTab, win: &JoshutoPanel, config_t: &JoshutoConfig) {
+    if let Some(path) = curr_tab.curr_path.parent() {
+        match curr_tab
+            .history
+            .entry(path.clone().to_path_buf())
+        {
+            Entry::Occupied(mut entry) => {
+                win.display_contents(entry.get_mut(), config_t.scroll_offset);
+                win.queue_for_refresh();
+            }
+            Entry::Vacant(entry) => {
+                if let Ok(s) = JoshutoDirList::new(path.to_path_buf(), &config_t.sort_option) {
+                    win.display_contents(entry.insert(s), config_t.scroll_offset);
+                    win.queue_for_refresh();
+                }
+            }
+        }
+    }
+}
 
-pub fn preview_file(curr_tab: &mut JoshutoTab, views: &JoshutoView, config_t: &JoshutoConfig) {
-    if let Some(ref curr_list) = curr_tab.curr_list {
-        if let Some(entry) = curr_list.get_curr_ref() {
-            if entry.path.is_dir() {
+pub fn preview_entry(curr_tab: &mut JoshutoTab, win: &JoshutoPanel, config_t: &JoshutoConfig)-> Result<(), std::io::Error> {
+    match curr_tab.curr_list.get_curr_ref() {
+        Some(s) => {
+            if s.path.is_dir() {
                 match curr_tab
                     .history
-                    .get_mut_or_create(&entry.path, &config_t.sort_option)
+                    .entry(s.path.clone().to_path_buf())
                 {
-                    Ok(dirlist) => {
-                        views
-                            .right_win
-                            .display_contents(dirlist, config_t.scroll_offset);
-                        views.right_win.queue_for_refresh();
+                    Entry::Occupied(mut entry) => {
+                        win.display_contents(entry.get_mut(), config_t.scroll_offset);
+                        win.queue_for_refresh();
                     }
-                    Err(e) => {
-                        ui::wprint_err(&views.right_win, &e.to_string());
+                    Entry::Vacant(entry) => {
+                        if let Ok(s) = JoshutoDirList::new(s.path.to_path_buf(), &config_t.sort_option) {
+                            win.display_contents(entry.insert(s), config_t.scroll_offset);
+                            win.queue_for_refresh();
+                        }
                     }
                 }
             } else {
-                ncurses::werase(views.right_win.win);
-                ncurses::wnoutrefresh(views.right_win.win);
+                ncurses::werase(win.win);
+                win.queue_for_refresh();
+            }
+        }
+        None => {},
+    };
+    Ok(())
+}
+
+/*
+pub fn preview_file_old(curr_tab: &mut JoshutoTab, views: &JoshutoView, config_t: &JoshutoConfig) {
+    if let Some(entry) = curr_tab.curr_list.get_curr_ref() {
+        if entry.path.is_dir() {
+            match curr_tab
+                .history
+                .get_mut_or_create(&entry.path, &config_t.sort_option)
+            {
+                Ok(dirlist) => {
+                    views
+                        .right_win
+                        .display_contents(dirlist, config_t.scroll_offset);
+                    views.right_win.queue_for_refresh();
+                }
+                Err(e) => {
+                    ui::wprint_err(&views.right_win, &e.to_string());
+                }
             }
-        /*
-                    else {
-                        ncurses::werase(views.right_win.win);
+        } else {
+            ncurses::werase(views.right_win.win);
+            ncurses::wnoutrefresh(views.right_win.win);
+        }
+                else {
+                    ncurses::werase(views.right_win.win);
 
-                        if let Some(file_ext) = entry.path.extension() {
-                            if let Some(file_ext) = file_ext.to_str() {
-                                match file_ext {
-                                    "o" | "a" | "avi" | "mp3" | "mp4" | "wmv" | "wma" |
-                                    "mkv" | "flv" | "vob" | "wav" | "mpc" | "flac" |
-                                    "divx" | "xcf" | "pdf" | "torrent" | "class" | "so" |
-                                    "img" | "pyc" | "dmg" | "png" | "jpg" | "jpeg" | "out" | "svg" => {
-                                        ui::wprint_err(&context.views.right_win, "Binary File");
-                                    },
-                                    _ => {
-                                        let detective = mime_detective::MimeDetective::new().unwrap();
-                                        match detective.detect_filepath(&entry.path) {
-                                            Ok(mime_type) => {
-                                                match mime_type.type_() {
-                                                    mime::TEXT => {
-                                                        text_preview(&context.views.right_win, &entry.path);
-                                                    },
-                                                    _ => {
-                                                        ui::wprint_err(&context.views.right_win, mime_type.type_().as_str());
-                                                    },
-                                                }
-                                            },
-                                            Err(e) => {
-                                                ui::wprint_err(&context.views.right_win, e.to_string().as_str());
-                                            },
-                                        }
+                    if let Some(file_ext) = entry.path.extension() {
+                        if let Some(file_ext) = file_ext.to_str() {
+                            match file_ext {
+                                "o" | "a" | "avi" | "mp3" | "mp4" | "wmv" | "wma" |
+                                "mkv" | "flv" | "vob" | "wav" | "mpc" | "flac" |
+                                "divx" | "xcf" | "pdf" | "torrent" | "class" | "so" |
+                                "img" | "pyc" | "dmg" | "png" | "jpg" | "jpeg" | "out" | "svg" => {
+                                    ui::wprint_err(&context.views.right_win, "Binary File");
+                                },
+                                _ => {
+                                    let detective = mime_detective::MimeDetective::new().unwrap();
+                                    match detective.detect_filepath(&entry.path) {
+                                        Ok(mime_type) => {
+                                            match mime_type.type_() {
+                                                mime::TEXT => {
+                                                    text_preview(&context.views.right_win, &entry.path);
+                                                },
+                                                _ => {
+                                                    ui::wprint_err(&context.views.right_win, mime_type.type_().as_str());
+                                                },
+                                            }
+                                        },
+                                        Err(e) => {
+                                            ui::wprint_err(&context.views.right_win, e.to_string().as_str());
+                                        },
                                     }
                                 }
                             }
                         }
-
-                        ncurses::wnoutrefresh(context.views.right_win.win);
                     }
-        */
-        } else {
-            ncurses::werase(views.right_win.win);
-            ncurses::wnoutrefresh(views.right_win.win);
-        }
+
+                    ncurses::wnoutrefresh(context.views.right_win.win);
+                }
+    } else {
+    ncurses::werase(views.right_win.win);
+    ncurses::wnoutrefresh(views.right_win.win);
     }
 }
+*/
 
 /*
 pub fn text_preview(win: &JoshutoPanel, path: &PathBuf) {