Skip to content

Commit

Permalink
Always emit trailing zero in human-readable download progress
Browse files Browse the repository at this point in the history
The human-readable download progress (e.g. "8.2 MiB") typically changes rapidly and, especially in the common "MiB" range, is very "jumpy" if the trailing digit is only shown if it's non-zero.

Closes #16950.

PiperOrigin-RevId: 493849764
Change-Id: I115923d572b35e304280499746d28a24df83c3f3
  • Loading branch information
fmeum authored and copybara-github committed Dec 8, 2022
1 parent 86dee6d commit 66b58ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,9 @@ public static <V> V refreshIfUnauthenticated(
}

private static final ImmutableList<String> UNITS = ImmutableList.of("KiB", "MiB", "GiB", "TiB");
// Format as single digit decimal number, but skipping the trailing .0.
// Format as single digit decimal number.
private static final DecimalFormat BYTE_COUNT_FORMAT =
new DecimalFormat("0.#", new DecimalFormatSymbols(Locale.US));
new DecimalFormat("0.0", new DecimalFormatSymbols(Locale.US));

/**
* Converts the number of bytes to a human readable string, e.g. 1024 -> 1 KiB.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ public class UtilsTest {
@Test
public void bytesCountToDisplayString_works() {
assertThat(bytesCountToDisplayString(1000)).isEqualTo("1000 B");
assertThat(bytesCountToDisplayString(1 << 10)).isEqualTo("1 KiB");
assertThat(bytesCountToDisplayString(1 << 10)).isEqualTo("1.0 KiB");
assertThat(bytesCountToDisplayString((1 << 10) + (1 << 10) / 10)).isEqualTo("1.1 KiB");
assertThat(bytesCountToDisplayString(1 << 20)).isEqualTo("1 MiB");
assertThat(bytesCountToDisplayString(1 << 20)).isEqualTo("1.0 MiB");
assertThat(bytesCountToDisplayString((1 << 20) + (1 << 20) / 10)).isEqualTo("1.1 MiB");
assertThat(bytesCountToDisplayString(1 << 30)).isEqualTo("1 GiB");
assertThat(bytesCountToDisplayString(1 << 30)).isEqualTo("1.0 GiB");
assertThat(bytesCountToDisplayString((1 << 30) + (1 << 30) / 10)).isEqualTo("1.1 GiB");
assertThat(bytesCountToDisplayString(1L << 40)).isEqualTo("1 TiB");
assertThat(bytesCountToDisplayString(1L << 40)).isEqualTo("1.0 TiB");
assertThat(bytesCountToDisplayString((1L << 40) + (1L << 40) / 10)).isEqualTo("1.1 TiB");
assertThat(bytesCountToDisplayString(1L << 50)).isEqualTo("1024 TiB");
assertThat(bytesCountToDisplayString(1L << 50)).isEqualTo("1024.0 TiB");
}
}

0 comments on commit 66b58ee

Please sign in to comment.