From 0512ff6e64d6e5f0867168a23d92c47c622a2f36 Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Fri, 16 Feb 2024 07:26:31 -0500
Subject: [PATCH] Format sizes in the web view in "1.23 MiB" style

---
 CHANGELOG.md                              |  1 +
 Cargo.lock                                | 16 +++++++++
 Cargo.toml                                |  1 +
 src/dav/html.rs                           | 41 ++++++++++++++++++++++-
 src/dav/templates/collection.html.tera    |  2 +-
 src/testdata/render-collection/basic.html |  8 ++---
 6 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac2a8b5..532ba56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ In Development
 - Add links to version & asset metadata to the web view
 - Adjust the format of timestamps in the web view: Always use UTC, show the
   timezone as "Z", prevent line breaking in the middle, wrap in `<time>` tag
+- Format sizes in the web view in "1.23 MiB" style
 
 v0.2.0 (2024-02-07)
 -------------------
diff --git a/Cargo.lock b/Cargo.lock
index c3e2585..59007d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -834,6 +834,7 @@ dependencies = [
  "clap",
  "enum_dispatch",
  "futures-util",
+ "humansize",
  "indoc",
  "itertools",
  "moka",
@@ -1276,6 +1277,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "hyper"
 version = "0.14.28"
@@ -1435,6 +1445,12 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.13"
diff --git a/Cargo.toml b/Cargo.toml
index 7bc39d8..59136d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ bytes = "1.5.0"
 clap = { version = "4.4.18", default-features = false, features = ["derive", "error-context", "help", "std", "suggestions", "usage", "wrap_help"] }
 enum_dispatch = "0.3.12"
 futures-util = "0.3.30"
+humansize = "2.1.3"
 indoc = "2.0.4"
 itertools = "0.12.1"
 moka = { version = "0.12.5", features = ["future"] }
diff --git a/src/dav/html.rs b/src/dav/html.rs
index 48a3701..0c25209 100644
--- a/src/dav/html.rs
+++ b/src/dav/html.rs
@@ -2,8 +2,10 @@ use super::util::Href;
 use super::{DavCollection, DavItem, DavResource, ResourceKind};
 use crate::consts::HTML_TIMESTAMP_FORMAT;
 use crate::paths::Component;
+use humansize::{format_size_i, BINARY};
 use serde::{ser::Serializer, Serialize};
-use tera::{Context, Error, Tera};
+use std::collections::HashMap;
+use tera::{Context, Error, Filter, Tera, Value};
 use thiserror::Error;
 use time::OffsetDateTime;
 
@@ -14,6 +16,7 @@ pub(crate) struct Templater(Tera);
 impl Templater {
     pub(crate) fn load() -> Result<Self, TemplateError> {
         let mut engine = Tera::default();
+        engine.register_filter("formatsize", FormatSizeFilter);
         engine
             .add_raw_template("collection.html", COLLECTION_TEMPLATE)
             .map_err(|source| TemplateError::Load {
@@ -216,9 +219,45 @@ where
     s
 }
 
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+struct FormatSizeFilter;
+
+impl Filter for FormatSizeFilter {
+    fn filter(&self, value: &Value, _args: &HashMap<String, Value>) -> Result<Value, Error> {
+        match value.as_i64() {
+            Some(size) => Ok(formatsize(size).into()),
+            None => Err(Error::msg("Input to formatsize filter must be an integer")),
+        }
+    }
+
+    fn is_safe(&self) -> bool {
+        true
+    }
+}
+
+fn formatsize(size: i64) -> String {
+    format_size_i(size, BINARY)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
+    use rstest::rstest;
+
+    #[rstest]
+    #[case(0, "0 B")]
+    #[case(42, "42 B")]
+    #[case(1000, "1000 B")]
+    #[case(1024, "1 KiB")]
+    #[case(1025, "1.00 KiB")]
+    #[case(1525, "1.49 KiB")]
+    #[case(1535, "1.50 KiB")]
+    #[case(1536, "1.50 KiB")]
+    #[case(10240, "10 KiB")]
+    #[case(10752, "10.50 KiB")]
+    fn test_formatsize(#[case] size: i64, #[case] s: &str) {
+        assert_eq!(formatsize(size), s);
+    }
 
     mod render_collection {
         use super::*;
diff --git a/src/dav/templates/collection.html.tera b/src/dav/templates/collection.html.tera
index 59bdfda..da1715f 100644
--- a/src/dav/templates/collection.html.tera
+++ b/src/dav/templates/collection.html.tera
@@ -32,7 +32,7 @@
             </td>
             <td class="type">{{r.kind}}</td>
             {%- if r.size is defined %}
-            <td class="size">{{r.size}}</td>
+            <td class="size">{{r.size|formatsize}}</td>
             {%- else %}
             <td class="null">&#x2014;</td>
             {%- endif %}
diff --git a/src/testdata/render-collection/basic.html b/src/testdata/render-collection/basic.html
index 182f89a..984ee57 100644
--- a/src/testdata/render-collection/basic.html
+++ b/src/testdata/render-collection/basic.html
@@ -51,7 +51,7 @@
                 </div>
             </td>
             <td class="type">Zarr asset</td>
-            <td class="size">1234567890</td>
+            <td class="size">1.15 GiB</td>
             <td class="created"><time>2021-01-01 01:23:45Z</time></td>
             <td class="modified"><time>2023-12-31 12:34:56Z</time></td>
         </tr>
@@ -63,7 +63,7 @@
                 </div>
             </td>
             <td class="type">Version metadata</td>
-            <td class="size">42</td>
+            <td class="size">42 B</td>
             <td class="null">&#x2014;</td>
             <td class="null">&#x2014;</td>
         </tr>
@@ -77,7 +77,7 @@
                 </div>
             </td>
             <td class="type">Blob asset</td>
-            <td class="size">0</td>
+            <td class="size">0 B</td>
             <td class="created"><time>2024-02-15 03:13:22Z</time></td>
             <td class="modified"><time>2024-02-15 03:13:35Z</time></td>
         </tr>
@@ -91,7 +91,7 @@
                 </div>
             </td>
             <td class="type">Blob asset</td>
-            <td class="size">123456</td>
+            <td class="size">120.56 KiB</td>
             <td class="created"><time>2021-02-03 06:47:50Z</time></td>
             <td class="modified"><time>2022-03-10 12:03:29Z</time></td>
         </tr>