From 188055c812a8b6610bc2f6d3a707de9428beebc4 Mon Sep 17 00:00:00 2001 From: pcmid Date: Mon, 25 Oct 2021 16:39:14 +0800 Subject: [PATCH] Fix: multiply the number of bytes by 8 --- crates/librqbit/src/http_api.rs | 14 +++++++------- crates/librqbit_core/src/speed_estimator.rs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/librqbit/src/http_api.rs b/crates/librqbit/src/http_api.rs index 6ba2eba..dcff7a5 100644 --- a/crates/librqbit/src/http_api.rs +++ b/crates/librqbit/src/http_api.rs @@ -181,10 +181,10 @@ impl ApiInternal { managed.output_folder ), AddTorrentResponse::ListOnly(ListOnlyResponse { - info_hash, - info, - only_files, - }) => ApiAddTorrentResponse { + info_hash, + info, + only_files, + }) => ApiAddTorrentResponse { id: None, details: make_torrent_details(&info_hash, &info, only_files.as_deref()), }, @@ -221,7 +221,7 @@ impl ApiInternal { Some(StatsResponse { average_piece_download_time: snapshot.average_piece_download_time(), snapshot, - all_time_download_speed: (downloaded_mb / elapsed.as_secs_f64()).into(), + all_time_download_speed: (downloaded_mb * 8f64 / elapsed.as_secs_f64()).into(), download_speed: estimator.download_mbps().into(), time_remaining: estimator.time_remaining(), }) @@ -325,7 +325,7 @@ impl HttpApi { // clippy suggests something that doesn't work here. #[allow(clippy::redundant_closure)] - move || match inner.dht.as_ref() { + move || match inner.dht.as_ref() { Some(dht) => dht.with_routing_table(|r| json_response(r)), None => not_found_response("DHT is off".into()), } @@ -355,7 +355,7 @@ impl HttpApi { return Ok::<_, warp::Rejection>(make_response( 400, "invalid utf-8".into(), - )) + )); } }; let opts = AddTorrentOptions { diff --git a/crates/librqbit_core/src/speed_estimator.rs b/crates/librqbit_core/src/speed_estimator.rs index da94e21..f03491b 100644 --- a/crates/librqbit_core/src/speed_estimator.rs +++ b/crates/librqbit_core/src/speed_estimator.rs @@ -68,7 +68,7 @@ impl SpeedEstimator { let downloaded_bytes_diff = downloaded_bytes - first.downloaded_bytes; let elapsed = instant - first.instant; - let bps = downloaded_bytes_diff as f64 / elapsed.as_secs_f64(); + let bps = downloaded_bytes_diff as f64 * 8f64 / elapsed.as_secs_f64(); let time_remaining_millis_rounded: u64 = if downloaded_bytes_diff > 0 { let time_remaining_secs = remaining_bytes as f64 / bps;