@@ -1,7 +1,8 @@ use std::collections::{HashMap, HashSet}; use anyhow::Result; +use chrono::{SecondsFormat, TimeZone, Utc}; use crate::memory::{to_base36, MemoryLane, MemoryStore, ResolvedRef}; #[derive( @@ -543,8 +544,11 @@ xml_escape(fact.session_id.as_deref().unwrap_or("")) ); if let Some(timestamp) = fact.timestamp { attrs.push_str(&format!(" t=\"{}\"", timestamp)); + if let Some(date) = format_timestamp_utc(timestamp) { + attrs.push_str(&format!(" date=\"{}\"", xml_escape(&date))); + } } if let Some(value) = &fact.value_text { attrs.push_str(&format!(" value=\"{}\"", xml_escape(value))); } @@ -582,11 +586,14 @@ .take(8) .filter_map(|index| packet.timeline.get(index)) { let line = format!( - " {}\n", + " {}\n", xml_escape(&event.ref_id), event.timestamp, + format_timestamp_utc(event.timestamp) + .map(|date| format!(" date=\"{}\"", xml_escape(&date))) + .unwrap_or_default(), event.ordinal, xml_escape(event.session_id.as_deref().unwrap_or("")), xml_escape(&truncate_chars(&event.text, 96)), ); @@ -611,8 +618,17 @@ out.push_str(" \n"); out } +fn format_timestamp_utc(timestamp: i64) -> Option { + if timestamp <= 0 { + return None; + } + Utc.timestamp_opt(timestamp, 0) + .single() + .map(|dt| dt.to_rfc3339_opts(SecondsFormat::Secs, true)) +} + fn push_packet_body( out: &mut String, packet: &EvidencePacket, index: usize, @@ -1175,8 +1191,9 @@ assert!(rendered.contains("")); assert!(rendered.contains("")); assert!(rendered.contains("ref=\"ref_fact\"")); + assert!(rendered.contains("date=\"1970-01-01T00:00:42Z\"")); assert!(rendered.contains("value=\"27:45\"")); assert!(rendered.contains("