From 56c580fc805f8e89e76e817ebc87cdee6b1a5c39 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 23 Jan 2021 16:26:25 +0100 Subject: [PATCH] Use file_fmt in explorer activity --- src/fs/explorer/builder.rs | 14 ++++++++++++++ src/ui/activities/filetransfer_activity/misc.rs | 1 + 2 files changed, 15 insertions(+) diff --git a/src/fs/explorer/builder.rs b/src/fs/explorer/builder.rs index 41ba028..7090f9f 100644 --- a/src/fs/explorer/builder.rs +++ b/src/fs/explorer/builder.rs @@ -24,6 +24,7 @@ */ // Locals +use super::formatter::Formatter; use super::{ExplorerOpts, FileExplorer, FileSorting, GroupDirs}; // Ext use std::collections::VecDeque; @@ -95,6 +96,18 @@ impl FileExplorerBuilder { } self } + + /// ### with_formatter + /// + /// Set formatter for FileExplorer + pub fn with_formatter(&mut self, fmt_str: Option<&str>) -> &mut FileExplorerBuilder { + if let Some(e) = self.explorer.as_mut() { + if let Some(fmt_str) = fmt_str { + e.fmt = Formatter::new(fmt_str); + } + } + self + } } #[cfg(test)] @@ -119,6 +132,7 @@ mod tests { .with_group_dirs(Some(GroupDirs::First)) .with_hidden_files(true) .with_stack_size(24) + .with_formatter(Some("{NAME}")) .build(); // Verify assert!(explorer.opts.intersects(ExplorerOpts::SHOW_HIDDEN_FILES)); diff --git a/src/ui/activities/filetransfer_activity/misc.rs b/src/ui/activities/filetransfer_activity/misc.rs index e9cb9dd..04669d1 100644 --- a/src/ui/activities/filetransfer_activity/misc.rs +++ b/src/ui/activities/filetransfer_activity/misc.rs @@ -133,6 +133,7 @@ impl FileTransferActivity { .with_group_dirs(cli.get_group_dirs()) .with_hidden_files(cli.get_show_hidden_files()) .with_stack_size(16) + .with_formatter(cli.get_file_fmt().as_deref()) .build(), None => FileExplorerBuilder::new() // Build default .with_file_sorting(FileSorting::ByName)