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

Progress bar: write ETA

Browse Source
This commit is contained in:
ChristianVisintin
2020-11-30 13:50:34 +01:00
parent 3d622b6b68
commit 3e9d77cfac
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
use std::collections::VecDeque; use std::collections::VecDeque;
use std::io::{Read, Seek, Write}; use std::io::{Read, Seek, Write};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::time::Instant;
use tui::{ use tui::{
layout::{Constraint, Corner, Direction, Layout, Rect}, layout::{Constraint, Corner, Direction, Layout, Rect},
style::{Color, Modifier, Style}, style::{Color, Modifier, Style},
@@ -211,6 +212,7 @@ pub struct FileTransferActivity {
input_txt: String, // Input text input_txt: String, // Input text
choice_opt: DialogYesNoOption, // Dialog popup selected option choice_opt: DialogYesNoOption, // Dialog popup selected option
transfer_progress: f64, // Current write/read progress (percentage) transfer_progress: f64, // Current write/read progress (percentage)
transfer_started: Instant, // Instant when progress has started
} }
impl FileTransferActivity { impl FileTransferActivity {
@@ -239,6 +241,7 @@ impl FileTransferActivity {
input_txt: String::new(), input_txt: String::new(),
choice_opt: DialogYesNoOption::Yes, choice_opt: DialogYesNoOption::Yes,
transfer_progress: 0.0, transfer_progress: 0.0,
transfer_started: Instant::now(),
} }
} }
@@ -344,6 +347,8 @@ impl FileTransferActivity {
"Uploading \"{}\"", "Uploading \"{}\"",
file_name file_name
))); )));
// Set started time
self.transfer_started = Instant::now();
let mut last_progress_val: f64 = 0.0; let mut last_progress_val: f64 = 0.0;
loop { loop {
// Read till you can // Read till you can
@@ -511,6 +516,8 @@ impl FileTransferActivity {
file_name file_name
))); )));
let mut total_bytes_written: usize = 0; let mut total_bytes_written: usize = 0;
// Set started time
self.transfer_started = Instant::now();
// Write local file // Write local file
let mut last_progress_val: f64 = 0.0; let mut last_progress_val: f64 = 0.0;
loop { loop {
@@ -1946,7 +1953,16 @@ impl FileTransferActivity {
/// ///
/// Draw progress popup /// Draw progress popup
fn draw_popup_progress(&self, text: String) -> Gauge { fn draw_popup_progress(&self, text: String) -> Gauge {
let label = format!("{:.2}%", self.transfer_progress); // Calculate ETA
let eta: String = match self.transfer_progress as u64 {
0 => String::from("--:--"), // NOTE: would divide by 0 :D
_ => {
let elapsed_secs: u64 = self.transfer_started.elapsed().as_secs();
let eta: u64 = ((elapsed_secs * 100) / (self.transfer_progress as u64)) - elapsed_secs;
format!("{:0width$}:{:0width$}", (eta / 60), (eta % 60), width = 2)
}
};
let label = format!("{:.2}% - ETA {}", self.transfer_progress, eta);
Gauge::default() Gauge::default()
.block(Block::default().borders(Borders::ALL).title(text)) .block(Block::default().borders(Borders::ALL).title(text))
.gauge_style( .gauge_style(