chrono feature and time utils, dlock internal extension management for arbitrary futures"

opencollector.yaml

@@ -32,7 +32,7 @@ exporters:
       stream-name: default
   # Writes all opentelemetry logs, traces, metrics to a file, useful for testing:
   file/debug_file_writing:
-    path: /home/runner/work/bitbazaar/bitbazaar/logs/otlp_telemetry_out.log
+    path: /Users/zak/z/code/bitbazaar/logs/otlp_telemetry_out.log
     rotation:
       max_megabytes: 10
       max_days: 3

rust/Cargo.toml

@@ -21,18 +21,19 @@ all-features = true
 
 [features]
 log-filter = ["dep:regex"]
-timing = ['dep:comfy-table', 'dep:chrono']
-cli = ['dep:normpath', 'dep:conch-parser', 'dep:homedir', 'dep:chrono', 'dep:strum']
+chrono = ['dep:chrono', 'dep:chrono-humanize']
+timing = ['dep:comfy-table', 'chrono']
+cli = ['dep:normpath', 'dep:conch-parser', 'dep:homedir', 'chrono', 'dep:strum']
 redis = [
+  'dep:tokio',
   'dep:deadpool-redis',
   'dep:redis',
   "dep:redis-macros",
   'dep:sha1_smol',
   'dep:serde_json',
   'dep:rand',
   'dep:futures',
-  'dep:futures-timer',
-  'dep:chrono',
+  'chrono',
   'dep:uuid',
 ]
 opentelemetry-grpc = [
@@ -73,13 +74,16 @@ time = { version = "0.3", features = ["local-offset"] }
 colored = '2'
 
 # Not in default, but randomly useful in features:
-chrono = { version = '0.4', optional = true }
 strum = { version = "0.25", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
 rand = { version = "0.8", optional = true }
 futures = { version = "0.3", optional = true }
-futures-timer = { version = "3", optional = true }
 uuid = { version = "1.6", features = ["v4"], optional = true }
+tokio = { version = '1', optional = true }
+
+# FEAT: chrono: (but also sometimes enabled by other features)
+chrono = { version = '0.4', optional = true }
+chrono-humanize = { version = "0.2", optional = true }
 
 # FEAT: log-filter:
 regex = { version = '1', optional = true }
@@ -125,7 +129,7 @@ hostname = "0.3.1"
 rstest = "0.18"
 portpicker = '0.1.1'
 tempfile = '3.8'
-tokio = { version = '1.35', features = ["rt-multi-thread", "macros"] }
+tokio = { version = '1', features = ["rt-multi-thread", "macros"] }
 uuid = { version = "1.6", features = ["v4"] }
 regex = "1"
 serde_json = "1"

rust/bitbazaar/chrono/chrono_formatting.rs

@@ -0,0 +1,52 @@
+/// Formats a [`chrono::Duration`]` in the present case.
+/// Arguments:
+/// - `td`: The duration to format.
+/// - `precise`: If true, smaller units will be included.
+pub fn chrono_format_td(td: chrono::Duration, precise: bool) -> String {
+    // The rough formatting does some funkiness with "now" when less than 10 seconds, so just handle simple seconds case manually:
+    if !precise && td.num_seconds() <= 59 {
+        let secs = td.num_seconds().max(1);
+        format!("{} second{}", secs, if secs > 1 { "s" } else { "" })
+    } else {
+        chrono_humanize::HumanTime::from(td).to_text_en(
+            if precise {
+                chrono_humanize::Accuracy::Precise
+            } else {
+                chrono_humanize::Accuracy::Rough
+            },
+            chrono_humanize::Tense::Present,
+        )
+    }
+}
+
+/// Convert a chrono datetime to the local timezone.
+///
+/// Arguments:
+/// - `dt`: The datetime to convert.
+pub fn chrono_dt_to_local(dt: chrono::DateTime<chrono::Utc>) -> chrono::DateTime<chrono::Local> {
+    dt.with_timezone(&chrono::Local)
+}
+
+/// Formats a [`chrono::DateTime`], also localising it to the user's timezone.
+///
+/// Arguments:
+/// - `dt`: The datetime to format.
+pub fn chrono_format_dt(dt: chrono::DateTime<chrono::Utc>) -> String {
+    let dt = chrono_dt_to_local(dt);
+
+    let date = dt.date_naive();
+    let today = chrono::Local::now().date_naive();
+    let yesterday = today.pred_opt();
+
+    // If today then: "Today, 12:34"
+    if date == today {
+        format!("Today, {}", dt.format("%H:%M"))
+    }
+    // Same for yesterday:
+    else if yesterday.is_some() && date == yesterday.unwrap() {
+        format!("Yesterday, {}", dt.format("%H:%M"))
+    } else {
+        // Otherwise e.g. 15 March 2021, 12:34
+        dt.format("%-e %B %Y, %H:%M").to_string()
+    }
+}

rust/bitbazaar/chrono/mod.rs

@@ -0,0 +1,3 @@
+mod chrono_formatting;
+
+pub use chrono_formatting::*;

rust/bitbazaar/lib.rs

@@ -11,6 +11,9 @@ mod prelude;
 /// Command line interface utilities.
 pub mod cli;
 
+#[cfg(feature = "chrono")]
+/// Chrono utilities
+pub mod chrono;
 /// Error handling utilities.
 pub mod errors;
 /// Hashing utilities.

rust/bitbazaar/redis/batch.rs

@@ -173,10 +173,15 @@ impl<'a, 'b, 'c, ReturnType> RedisBatch<'a, 'b, 'c, ReturnType> {
         set_key: &str,
         values: impl IntoIterator<Item = T>,
     ) -> Self {
+        let members = values.into_iter().collect::<Vec<_>>();
+        // No-op if no members so skip (redis would actually error if empty anyway)
+        if members.is_empty() {
+            return self;
+        }
         self.pipe
             .zrem(
                 self.redis_conn.final_key(set_namespace, set_key.into()),
-                values.into_iter().collect::<Vec<_>>(),
+                members,
             )
             // Ignoring so it doesn't take up a space in the tuple response.
             .ignore();