Add roundsize function

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to eww will be listed here, starting at changes since versio
 - Add trigonometric functions (`sin`, `cos`, `tan`, `cot`) and degree/radian conversions (`degtorad`, `radtodeg`) (By: end-4)
 - Add `substring` function to simplexpr
 - Add `--duration` flag to `eww open`
+- Add `roundsize` function to simplexpr
 
 ## [0.4.0] (04.09.2022)
 

crates/simplexpr/Cargo.toml

@@ -31,6 +31,7 @@ chrono-tz = "0.8.2"
 strum = { version = "0.24", features = ["derive"] }
 
 eww_shared_util = { version = "0.1.0", path = "../eww_shared_util" }
+number_prefix = "0.4.0"
 
 
 [build-dependencies]

crates/simplexpr/src/eval.rs

@@ -1,12 +1,14 @@
 use cached::proc_macro::cached;
 use chrono::{Local, LocalResult, TimeZone};
 use itertools::Itertools;
+use number_prefix::NumberPrefix;
 
 use crate::{
     ast::{AccessType, BinOp, SimplExpr, UnaryOp},
     dynval::{ConversionError, DynVal},
 };
 use eww_shared_util::{Span, Spanned, VarName};
+use serde_json::json;
 use std::{
     collections::HashMap,
     convert::{TryFrom, TryInto},
@@ -320,6 +322,33 @@ fn call_expr_function(name: &str, args: Vec<DynVal>) -> Result<DynVal, EvalError
             }
             _ => Err(EvalError::WrongArgCount(name.to_string())),
         },
+        "roundsize" => match args.as_slice() {
+            [size] => {
+                let size = size.as_f64()?;
+                Ok(match NumberPrefix::binary(size) {
+                    NumberPrefix::Standalone(bytes) => DynVal::from(json!({"size": bytes, "units": "B"}).to_string()),
+                    NumberPrefix::Prefixed(prefix, n) => {
+                        DynVal::from(json!({"size": n, "units": format!("{}B", prefix)}).to_string())
+                    }
+                })
+            }
+            [size, format_type] => {
+                let format_type = format_type.as_string()?;
+                let func = match format_type.as_str() {
+                    "decimal" => NumberPrefix::decimal,
+                    "binary" => NumberPrefix::binary,
+                    _ => return Err(EvalError::NoVariablesAllowed(format_type.parse().unwrap())),
+                };
+                let size = size.as_f64()?;
+                Ok(match func(size) {
+                    NumberPrefix::Standalone(bytes) => DynVal::from(json!({"size": bytes, "units": "B"}).to_string()),
+                    NumberPrefix::Prefixed(prefix, n) => {
+                        DynVal::from(json!({"size": n, "units": format!("{}B", prefix)}).to_string())
+                    }
+                })
+            }
+            _ => Err(EvalError::WrongArgCount(name.to_string())),
+        },
         "sin" => match args.as_slice() {
             [num] => {
                 let num = num.as_f64()?;

docs/src/expression_language.md

@@ -59,3 +59,5 @@ Supported currently are the following features:
       Same as other `formattime`, but does not accept timezone. Instead, it uses system's local timezone.
       Check [chrono's documentation](https://docs.rs/chrono/latest/chrono/format/strftime/index.html) for more
       information about format string.
+    - `roundsize(bytes)`: Round a number of bytes to human-readable on binary base (KiB, MiB, GiB). Returned value format `{ size, units }` 
+    - `roundsize(bytes, format_type)`: Round a number of bytes to human-readable with specific format type it's can be `binary (KiB, MiB, GiB...)` or `decimal (KB, MB, GB...)`. Returned value format `{ size, units }`