Write current path on explorer tabs

This commit is contained in:
ChristianVisintin 2020-12-05 16:32:16 +01:00
parent 1ece4eabfd
commit 9bb19abd0c
3 changed files with 38 additions and 6 deletions

18
Cargo.lock generated
View file

@ -175,6 +175,17 @@ dependencies = [
"wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
name = "hostname"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
dependencies = [
"libc",
"match_cfg",
"winapi",
]
[[package]]
name = "instant"
version = "0.1.9"
@ -258,6 +269,12 @@ dependencies = [
"cfg-if 0.1.10",
]
[[package]]
name = "match_cfg"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
[[package]]
name = "memchr"
version = "2.3.4"
@ -653,6 +670,7 @@ dependencies = [
"crossterm",
"ftp",
"getopts",
"hostname",
"lazy_static",
"regex",
"rpassword",

View file

@ -28,6 +28,7 @@ bytesize = "1.0.1"
textwrap = "0.12.1"
regex = "1.4.2"
lazy_static = "1.4.0"
hostname = "0.3.1"
[target.'cfg(any(unix, macos, linux))'.dependencies]
users = "0.11.0"

View file

@ -19,10 +19,13 @@
*
*/
extern crate hostname;
use super::{
Context, DialogYesNoOption, FileExplorerTab, FileTransferActivity, FsEntry, InputField,
InputMode, LogLevel, LogRecord, PopupType,
};
use std::path::PathBuf;
use tui::{
layout::{Constraint, Corner, Direction, Layout, Rect},
style::{Color, Modifier, Style},
@ -37,6 +40,7 @@ impl FileTransferActivity {
/// Draw UI
pub(super) fn draw(&mut self) {
let mut ctx: Context = self.context.take().unwrap();
let local_wrkdir: PathBuf = ctx.local.pwd();
let _ = ctx.terminal.draw(|f| {
// Prepare chunks
let chunks = Layout::default()
@ -66,12 +70,17 @@ impl FileTransferActivity {
remote_state.select(Some(self.remote.index));
// Draw tabs
f.render_stateful_widget(
self.draw_local_explorer(),
self.draw_local_explorer(local_wrkdir),
tabs_chunks[0],
&mut localhost_state,
);
// Get pwd
let remote_wrkdir: PathBuf = match self.client.pwd() {
Ok(p) => p,
Err(_) => PathBuf::from("/")
};
f.render_stateful_widget(
self.draw_remote_explorer(),
self.draw_remote_explorer(remote_wrkdir),
tabs_chunks[1],
&mut remote_state,
);
@ -141,7 +150,11 @@ impl FileTransferActivity {
/// ### draw_local_explorer
///
/// Draw local explorer list
pub(super) fn draw_local_explorer(&self) -> List {
pub(super) fn draw_local_explorer(&self, local_wrkdir: PathBuf) -> List {
let hostname: String = match hostname::get() {
Ok(h) => String::from(h.as_os_str().to_string_lossy()),
Err(_) => String::from("localhost"),
};
let files: Vec<ListItem> = self
.local
.files
@ -159,7 +172,7 @@ impl FileTransferActivity {
},
_ => Style::default(),
})
.title("Localhost"),
.title(format!("{}:{} ", hostname, local_wrkdir.display())),
)
.start_corner(Corner::TopLeft)
.highlight_style(
@ -172,7 +185,7 @@ impl FileTransferActivity {
/// ### draw_remote_explorer
///
/// Draw remote explorer list
pub(super) fn draw_remote_explorer(&self) -> List {
pub(super) fn draw_remote_explorer(&self, remote_wrkdir: PathBuf) -> List {
let files: Vec<ListItem> = self
.remote
.files
@ -190,7 +203,7 @@ impl FileTransferActivity {
},
_ => Style::default(),
})
.title(self.params.address.clone()),
.title(format!("{}:{} ", self.params.address, remote_wrkdir.display())),
)
.start_corner(Corner::TopLeft)
.highlight_style(