diff options
author | DLFW <daniel@llin.info> | 2022-02-02 03:23:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-01 21:23:38 -0500 |
commit | e29904dcd71a864eb7b33df55f800e885b870fd4 (patch) | |
tree | eb9d80b875b3dbdac268d60454d55810a758f1d6 /src/preview | |
parent | 65f937083bf6e26b178550d7936dd288ba024e53 (diff) |
code cleanup (#135)
* code cleanup
Remove dead code and unused imports around preview features.
* Remove unused config option [display]show_preview
* Remove config option [preview]preview_images
* Remove unused imports
* Remove dead code and unused imports
Diffstat (limited to 'src/preview')
-rw-r--r-- | src/preview/preview_default.rs | 16 | ||||
-rw-r--r-- | src/preview/preview_dir.rs | 19 | ||||
-rw-r--r-- | src/preview/preview_file.rs | 99 |
3 files changed, 6 insertions, 128 deletions
diff --git a/src/preview/preview_default.rs b/src/preview/preview_default.rs index 56947b6..8a216c9 100644 --- a/src/preview/preview_default.rs +++ b/src/preview/preview_default.rs @@ -3,14 +3,8 @@ use std::path; use crate::context::AppContext; use crate::fs::JoshutoMetadata; use crate::preview::{preview_dir, preview_file}; -use crate::ui::TuiBackend; - -pub fn load_preview_path( - context: &mut AppContext, - backend: &mut TuiBackend, - p: path::PathBuf, - metadata: JoshutoMetadata, -) { + +pub fn load_preview_path(context: &mut AppContext, p: path::PathBuf, metadata: JoshutoMetadata) { let preview_options = context.config_ref().preview_options_ref(); if metadata.is_dir() { @@ -32,13 +26,13 @@ pub fn load_preview_path( .is_none(); if need_to_load { - preview_file::Background::preview_path_with_script(context, backend, p); + preview_file::Background::preview_path_with_script(context, p); } } else { } } -pub fn load_preview(context: &mut AppContext, backend: &mut TuiBackend) { +pub fn load_preview(context: &mut AppContext) { let mut load_list = Vec::with_capacity(2); let curr_tab = context.tab_context_ref().curr_tab_ref(); @@ -57,6 +51,6 @@ pub fn load_preview(context: &mut AppContext, backend: &mut TuiBackend) { } for (path, metadata) in load_list { - load_preview_path(context, backend, path, metadata); + load_preview_path(context, path, metadata); } } diff --git a/src/preview/preview_dir.rs b/src/preview/preview_dir.rs index 957b235..9c4a028 100644 --- a/src/preview/preview_dir.rs +++ b/src/preview/preview_dir.rs @@ -1,28 +1,9 @@ -use std::io; use std::path; use std::thread; use crate::context::AppContext; use crate::event::AppEvent; use crate::fs::JoshutoDirList; -use crate::history::DirectoryHistory; - -#[allow(dead_code)] -pub struct Foreground {} - -impl Foreground { - pub fn load_preview(context: &mut AppContext, p: path::PathBuf) -> io::Result<()> { - let options = context.config_ref().display_options_ref().clone(); - let history = context.tab_context_mut().curr_tab_mut().history_mut(); - if history - .create_or_soft_update(p.as_path(), &options) - .is_err() - { - history.remove(p.as_path()); - } - Ok(()) - } -} pub struct Background {} diff --git a/src/preview/preview_file.rs b/src/preview/preview_file.rs index 36880e1..dac3ad2 100644 --- a/src/preview/preview_file.rs +++ b/src/preview/preview_file.rs @@ -1,19 +1,9 @@ -use std::io; use std::path; use std::process::{Command, Output}; use std::thread; -use tui::layout::Constraint; - use crate::context::AppContext; use crate::event::AppEvent; -use crate::ui::{self, TuiBackend}; - -#[derive(Clone, Debug)] -pub enum PreviewState { - NoPreview, - SomePreview(FilePreview), -} #[derive(Clone, Debug)] pub struct FilePreview { @@ -35,96 +25,12 @@ impl std::convert::From<Output> for FilePreview { } } -#[allow(dead_code)] -pub struct Foreground {} - -impl Foreground { - pub fn preview_path_with_script( - context: &AppContext, - backend: &mut TuiBackend, - p: path::PathBuf, - ) -> io::Result<Output> { - let config = context.config_ref(); - let preview_options = config.preview_options_ref(); - - match preview_options.preview_script.as_ref() { - None => Err(io::Error::new( - io::ErrorKind::Other, - "No preview script specified", - )), - Some(script) => { - let area = backend.terminal.as_ref().unwrap().size().unwrap(); - let display_options = config.display_options_ref(); - let constraints: &[Constraint; 3] = &display_options.default_layout; - - let ui_context = context.ui_context_ref(); - if ui_context.layout.is_empty() { - return Err(io::Error::new(io::ErrorKind::Other, "No preview area")); - } - let layout_rect = &ui_context.layout[ui_context.layout.len() - 1]; - - let file_full_path = p.as_path(); - let preview_width = layout_rect.width; - let preview_height = layout_rect.height; - let preview_x_coord = layout_rect.x; - let preview_y_coord = layout_rect.y; - - let image_cache = 0; - let preview_image = if preview_options.preview_images { 1 } else { 0 }; - - // spawn preview process - Command::new(script) - .arg("--path") - .arg(file_full_path) - .arg("--preview-width") - .arg(preview_width.to_string()) - .arg("--preview-height") - .arg(preview_height.to_string()) - .arg("--x-coord") - .arg(preview_x_coord.to_string()) - .arg("--y-coord") - .arg(preview_y_coord.to_string()) - .arg("--preview-images") - .arg(preview_image.to_string()) - .arg("--image-cache") - .arg(image_cache.to_string()) - .output() - } - } - } - - pub fn preview_with_script( - context: &AppContext, - backend: &mut TuiBackend, - ) -> io::Result<Output> { - let curr_tab = context.tab_context_ref().curr_tab_ref(); - let child_list = curr_tab.child_list_ref(); - - match child_list.and_then(|list| list.curr_entry_ref()) { - None => Err(io::Error::new(io::ErrorKind::Other, "No file to preview")), - Some(entry) => { - Self::preview_path_with_script(context, backend, entry.file_path().to_path_buf()) - } - } - } -} - pub struct Background {} impl Background { - pub fn preview_path_with_script( - context: &AppContext, - backend: &mut TuiBackend, - path: path::PathBuf, - ) { + pub fn preview_path_with_script(context: &AppContext, path: path::PathBuf) { let preview_options = context.config_ref().preview_options_ref(); - let config = context.config_ref(); - if let Some(script) = preview_options.preview_script.as_ref() { - let area = backend.terminal.as_ref().unwrap().size().unwrap(); - let display_options = config.display_options_ref(); - let constraints: &[Constraint; 3] = &display_options.default_layout; - let ui_context = context.ui_context_ref(); if ui_context.layout.is_empty() { return; @@ -137,7 +43,6 @@ impl Background { let preview_y_coord = layout_rect.y; let image_cache = 0; - let preview_image = if preview_options.preview_images { 1 } else { 0 }; let script = script.clone(); let event_tx = context.clone_event_tx(); @@ -155,8 +60,6 @@ impl Background { .arg(preview_x_coord.to_string()) .arg("--y-coord") .arg(preview_y_coord.to_string()) - .arg("--preview-images") - .arg(preview_image.to_string()) .arg("--image-cache") .arg(image_cache.to_string()) .output(); |