vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Many fixes in UI

Browse Source
This commit is contained in:
ChristianVisintin
2020-11-29 17:05:12 +01:00
parent 9643280ab0
commit 28435aaeda
2 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fs/mod.rs
View File

@@ -170,7 +170,7 @@ impl std::fmt::Display for FsEntry {
let datetime: String = time_to_str(dir.last_change_time, "%b %d %Y %M:%H"); let datetime: String = time_to_str(dir.last_change_time, "%b %d %Y %M:%H");
write!( write!(
f, f,
"{:32}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}", "{:24}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}",
dir.name.as_str(), dir.name.as_str(),
mode, mode,
username, username,
@@ -259,7 +259,7 @@ impl std::fmt::Display for FsEntry {
let datetime: String = time_to_str(file.last_change_time, "%b %d %Y %M:%H"); let datetime: String = time_to_str(file.last_change_time, "%b %d %Y %M:%H");
write!( write!(
f, f,
"{:32}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}", "{:24}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}",
file.name.as_str(), file.name.as_str(),
mode, mode,
username, username,
@@ -352,7 +352,7 @@ impl std::fmt::Display for FsEntry {
let datetime: String = time_to_str(dir.last_change_time, "%b %d %Y %M:%H"); let datetime: String = time_to_str(dir.last_change_time, "%b %d %Y %M:%H");
write!( write!(
f, f,
"{:32}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}", "{:24}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}",
dir.name.as_str(), dir.name.as_str(),
mode, mode,
username, username,
@@ -435,7 +435,7 @@ impl std::fmt::Display for FsEntry {
let datetime: String = time_to_str(file.last_change_time, "%b %d %Y %M:%H"); let datetime: String = time_to_str(file.last_change_time, "%b %d %Y %M:%H");
write!( write!(
f, f,
"{:32}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}", "{:24}\t{:12}\t{:16}\t{:16}\t{:8}\t{:17}",
file.name.as_str(), file.name.as_str(),
mode, mode,
username, username,

43
src/ui/activities/filetransfer_activity.rs
View File

@@ -286,18 +286,7 @@ impl FileTransferActivity {
fn reload_remote_dir(&mut self) { fn reload_remote_dir(&mut self) {
// Get current entries // Get current entries
if let Ok(pwd) = self.client.pwd() { if let Ok(pwd) = self.client.pwd() {
match self.client.list_dir(pwd.as_path()) { self.remote_scan(pwd.as_path());
Ok(entries) => self.remote.files = entries,
Err(err) => self.log(
LogLevel::Error,
format!(
"Unable to get files from remote at '{}': {}",
pwd.display(),
err
)
.as_ref(),
),
}
} }
} }
@@ -577,7 +566,11 @@ impl FileTransferActivity {
/// Scan current remote directory /// Scan current remote directory
fn remote_scan(&mut self, path: &Path) { fn remote_scan(&mut self, path: &Path) {
match self.client.list_dir(path) { match self.client.list_dir(path) {
Ok(files) => self.remote.files = files, Ok(files) => {
// Reset index
self.remote.index = 0;
self.remote.files = files
}
Err(err) => { Err(err) => {
self.log( self.log(
LogLevel::Error, LogLevel::Error,
@@ -784,7 +777,7 @@ impl FileTransferActivity {
)); ));
} }
} }
'm' | 'M' => { 'd' | 'D' => {
// Make directory // Make directory
// If ctrl is enabled... // If ctrl is enabled...
if key.modifiers.intersects(KeyModifiers::CONTROL) { if key.modifiers.intersects(KeyModifiers::CONTROL) {
@@ -872,14 +865,8 @@ impl FileTransferActivity {
} }
KeyCode::Backspace => { KeyCode::Backspace => {
// Go to previous directory // Go to previous directory
loop { if let Some(d) = self.remote.popd() {
// Till a valid directory is found self.remote_changedir(d.as_path());
match self.remote.popd() {
Some(d) => {
self.remote_changedir(d.as_path());
}
None => break, // Break if stack is empty
}
} }
} }
KeyCode::Delete => { KeyCode::Delete => {
@@ -910,7 +897,7 @@ impl FileTransferActivity {
)); ));
} }
} }
'm' | 'M' => { 'd' | 'D' => {
// Make directory // Make directory
// If ctrl is enabled... // If ctrl is enabled...
if key.modifiers.intersects(KeyModifiers::CONTROL) { if key.modifiers.intersects(KeyModifiers::CONTROL) {
@@ -1544,7 +1531,7 @@ impl FileTransferActivity {
/// Draw header /// Draw header
fn draw_header(&self) -> Paragraph { fn draw_header(&self) -> Paragraph {
Paragraph::new(" _____ ____ ____ ____ \n|_ _|__ _ __ _ __ ___ / ___| / ___| _ \\ \n | |/ _ \\ '__| '_ ` _ \\\\___ \\| | | |_) |\n | | __/ | | | | | | |___) | |___| __/ \n |_|\\___|_| |_| |_| |_|____/ \\____|_| \n") Paragraph::new(" _____ ____ ____ ____ \n|_ _|__ _ __ _ __ ___ / ___| / ___| _ \\ \n | |/ _ \\ '__| '_ ` _ \\\\___ \\| | | |_) |\n | | __/ | | | | | | |___) | |___| __/ \n |_|\\___|_| |_| |_| |_|____/ \\____|_| \n")
.style(Style::default().fg(Color::LightYellow).add_modifier(Modifier::BOLD)) .style(Style::default().fg(Color::White).add_modifier(Modifier::BOLD))
} }
/// ### draw_local_explorer /// ### draw_local_explorer
@@ -1563,7 +1550,7 @@ impl FileTransferActivity {
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(match self.input_field { .border_style(match self.input_field {
InputField::Explorer => match self.tab { InputField::Explorer => match self.tab {
FileExplorerTab::Local => Style::default().fg(Color::Yellow), FileExplorerTab::Local => Style::default().fg(Color::LightYellow),
_ => Style::default(), _ => Style::default(),
}, },
_ => Style::default(), _ => Style::default(),
@@ -1594,7 +1581,7 @@ impl FileTransferActivity {
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(match self.input_field { .border_style(match self.input_field {
InputField::Explorer => match self.tab { InputField::Explorer => match self.tab {
FileExplorerTab::Remote => Style::default().fg(Color::Yellow), FileExplorerTab::Remote => Style::default().fg(Color::LightBlue),
_ => Style::default(), _ => Style::default(),
}, },
_ => Style::default(), _ => Style::default(),
@@ -1604,7 +1591,7 @@ impl FileTransferActivity {
.start_corner(Corner::TopLeft) .start_corner(Corner::TopLeft)
.highlight_style( .highlight_style(
Style::default() Style::default()
.fg(Color::LightYellow) .fg(Color::LightBlue)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
) )
} }
@@ -1647,7 +1634,7 @@ impl FileTransferActivity {
Block::default() Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(match self.input_field { .border_style(match self.input_field {
InputField::Logs => Style::default().fg(Color::Yellow), InputField::Logs => Style::default().fg(Color::LightGreen),
_ => Style::default(), _ => Style::default(),
}) })
.title("Log"), .title("Log"),