tighten math about ProgressBar::render

when `total` is defined

Author: 2bndy5

clang-installer/src/downloader/mod.rs

@@ -2,6 +2,7 @@ use reqwest::ClientBuilder;
 use std::{
     fs,
     io::Write,
+    num::NonZero,
     path::Path,
     time::{Duration, SystemTime},
 };
@@ -58,7 +59,7 @@ async fn download(url: &Url, cache_path: &Path, timeout: u64) -> Result<(), Down
         return Err(e.into());
     }
     let mut tmp_file = tempfile::NamedTempFile::new()?;
-    let content_len = response.content_length();
+    let content_len = response.content_length().and_then(NonZero::new);
     let mut progress_bar = ProgressBar::new(content_len, "Downloading");
     progress_bar.render()?;
     while let Some(chunk) = response.chunk().await? {

clang-installer/src/downloader/pypi.rs

@@ -7,6 +7,7 @@ use std::{
     collections::HashMap,
     fs,
     io::{Read, Write},
+    num::NonZero,
     path::PathBuf,
     str::FromStr,
     time::Duration,
@@ -475,25 +476,29 @@ impl PyPiDownloader {
                 if let Some(parent) = extracted_bin.parent() {
                     fs::create_dir_all(parent)?;
                 }
-                let file_size = file.size();
+                let file_size = NonZero::new(file.size());
                 let mut out = fs::OpenOptions::new()
                     .write(true)
                     .create(true)
                     .truncate(true)
                     .open(extracted_bin)?;
                 let mut buffer = [0; EXTRACTED_CHUNK_SIZE as usize];
                 let mut total_extracted = 0;
-                let mut progress_bar =
-                    ProgressBar::new(Some(file_size), "Extracting binary from wheel");
+                let mut progress_bar = ProgressBar::new(file_size, "Extracting binary from wheel");
                 progress_bar.render()?;
-                while total_extracted < file_size {
+                loop {
                     let bytes_read = file.read(&mut buffer)?;
                     if bytes_read == 0 {
                         break;
                     }
                     total_extracted += bytes_read as u64;
                     out.write_all(&buffer[..bytes_read])?;
                     progress_bar.inc(bytes_read as u64)?;
+                    if let Some(total_size) = file_size
+                        && total_extracted >= total_size.get()
+                    {
+                        break;
+                    }
                 }
                 progress_bar.finish()?;
                 #[cfg(unix)]

clang-installer/src/progress_bar.rs

@@ -1,9 +1,12 @@
-use std::io::{IsTerminal, Result, Write, stdout};
+use std::{
+    io::{IsTerminal, Result, Write, stdout},
+    num::NonZero,
+};
 
 /// A simple progress bar implementation that supports both interactive and non-interactive terminals.
 pub struct ProgressBar {
     /// The `total` size of the task being tracked, if known.
-    total: Option<u64>,
+    total: Option<NonZero<u64>>,
     /// The `current` progress towards the `total`.
     current: u64,
     /// The number of `steps` completed in the progress bar.
@@ -43,7 +46,7 @@ impl ProgressBar {
     /// progress_bar.finish().unwrap(); // clean up and write a line break (move to next line)
     /// // stdout lock is released when `progress_bar` goes out of scope
     /// ```
-    pub fn new(total: Option<u64>, prompt: &str) -> Self {
+    pub fn new(total: Option<NonZero<u64>>, prompt: &str) -> Self {
         let stdout_handle = stdout().lock();
         let is_interactive = stdout_handle.is_terminal();
         Self {
@@ -61,7 +64,7 @@ impl ProgressBar {
     /// If the `total` is known, then the progress bar will be updated based on the percentage of `current` to `total`.
     /// If the `total` is unknown, then the progress bar will simply increment by one step for each call to this method.
     pub fn inc(&mut self, delta: u64) -> Result<()> {
-        self.current += delta;
+        self.current = self.current.saturating_add(delta);
         self.render()
     }
 
@@ -77,7 +80,8 @@ impl ProgressBar {
     /// Subsequent updates should be made using [`Self::inc()`], which will call this method internally.
     pub fn render(&mut self) -> Result<()> {
         let advance_bar = self.total.map(|total| {
-            let progress = self.current as f64 / total as f64;
+            let total = total.get();
+            let progress = self.current.min(total) as f64 / total as f64;
 
             (progress * Self::MAX_BAR_WIDTH as f64).floor() as u32
         });
@@ -142,6 +146,8 @@ impl ProgressBar {
 
 #[cfg(test)]
 mod tests {
+    use std::num::NonZero;
+
     use super::ProgressBar;
 
     #[test]
@@ -155,7 +161,7 @@ mod tests {
 
     #[test]
     fn with_total() {
-        let mut progress_bar = ProgressBar::new(Some(100), "Processing");
+        let mut progress_bar = ProgressBar::new(Some(NonZero::new(100).unwrap()), "Processing");
         for _ in 0..100 {
             progress_bar.inc(1).unwrap();
         }