leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shorten command line output

Browse source
This commit is contained in:
Igor Katson 2023-12-06 01:00:45 +00:00
parent 4caed4f50d
commit 303c8a271d
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/rqbit/src/main.rs
View file

@ -377,7 +377,8 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
None => continue None => continue
}; };
let stats = handle.stats_snapshot(); let stats = handle.stats_snapshot();
let speed = handle.down_speed_estimator(); let down_speed = handle.down_speed_estimator();
let up_speed = handle.up_speed_estimator();
let total = stats.total_bytes; let total = stats.total_bytes;
let progress = stats.total_bytes - stats.remaining_bytes; let progress = stats.total_bytes - stats.remaining_bytes;
let downloaded_pct = if stats.remaining_bytes == 0 { let downloaded_pct = if stats.remaining_bytes == 0 {
@ -385,20 +386,23 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
} else { } else {
(progress as f64 / total as f64) * 100f64 (progress as f64 / total as f64) * 100f64
}; };
let time_remaining = down_speed.time_remaining();
let eta = match &time_remaining {
Some(d) => format!(", ETA: {:?}", d),
None => String::new()
};
info!( info!(
"[{}]: {:.2}% ({:.2}), down speed {:.2} MiB/s, fetched {}, remaining {:.2} of {:.2}, uploaded {:.2}, peers: {{live: {}, connecting: {}, queued: {}, seen: {}, dead: {}}}", "[{}]: {:.2}% ({:.2} / {:.2}), ↓{:.2} MiB/s, ↑{:.2} MiB/s ({:.2}){}, {{live: {}, queued: {}, dead: {}}}",
idx, idx,
downloaded_pct, downloaded_pct,
SF::new(progress), SF::new(progress),
speed.mbps(),
SF::new(stats.fetched_bytes),
SF::new(stats.remaining_bytes),
SF::new(total), SF::new(total),
down_speed.mbps(),
up_speed.mbps(),
SF::new(stats.uploaded_bytes), SF::new(stats.uploaded_bytes),
stats.peer_stats.live, eta,
stats.peer_stats.connecting, stats.peer_stats.live + stats.peer_stats.connecting,
stats.peer_stats.queued, stats.peer_stats.queued,
stats.peer_stats.seen,
stats.peer_stats.dead, stats.peer_stats.dead,
); );
} }