From 586639907bbcf568089c04aced6669116888cdbf Mon Sep 17 00:00:00 2001
From: kaotisk <kaotisk@arching-kaos.org>
Date: Sun, 16 Mar 2025 01:29:32 +0200
Subject: All date functions accumulated in _ak_utils

---
 lib/_ak_zblock | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib/_ak_zblock')

diff --git a/lib/_ak_zblock b/lib/_ak_zblock
index b4a546b..1313127 100755
--- a/lib/_ak_zblock
+++ b/lib/_ak_zblock
@@ -20,6 +20,7 @@
 #set -x
 source $AK_LIBDIR/_ak_log
 source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_utils
 source $AK_LIBDIR/_ak_gpg
 source $AK_LIBDIR/_ak_html
 source $AK_LIBDIR/_ak_ipfs
@@ -452,7 +453,7 @@ function _ak_zblock_show(){
 # }
 
 function _ak_zblock_gen_html(){
-    time_started=$(date -u +%s.%N)
+    time_started=$(_ak_datetime_unix_nanosecs)
     ss=$(echo $time_started | cut -d '.' -f 1)
     nss=$(echo $time_started | cut -d '.' -f 2)
     # Check if there are enough arguments
@@ -475,11 +476,11 @@ function _ak_zblock_gen_html(){
     _ak_zblock_show "$1" | jq > $arg
     _ak_generate_html_header > zblock-$1.html
     _ak_generate_html_zblock $arg >> zblock-$1.html
-    time_ended=$(date -u +%s.%N)
+    time_ended=$(_ak_datetime_unix_nanosecs)
     se=$(echo $time_ended | cut -d '.' -f 1)
     nse=$(echo $time_ended | cut -d '.' -f 2)
     printf '    <hr>\n' >> zblock-$1.html
-    printf '    <footer>Generated by %s on %s in %s.' "$PROGRAM" "$(datehuman)" "$(( $se - $ss ))">> zblock-$1.html
+    printf '    <footer>Generated by %s on %s in %s.' "$PROGRAM" "$(_ak_datetime_human)" "$(( $se - $ss ))">> zblock-$1.html
     if [ $nse -lt $nss ]
     then
         printf '%s seconds</footer>\n' "$(( 1$nse - $nss ))" >> zblock-$1.html
@@ -591,7 +592,7 @@ function _ak_zblock_repack(){
     PREVIOUS="$zblock_to_repack_at"
     _ak_log_debug "Previous: $PREVIOUS"
     # We create a block of json like this:
-    printf '{"timestamp":"%s","action":"%s","data":"%s","detach":"%s","gpg":"%s","previous":"%s"}' $(date -u +%s) $ACTION $MESSAGE_HASH $MESSAGE_SIGNATURE $GPG_PUB_KEY $PREVIOUS > block
+    printf '{"timestamp":"%s","action":"%s","data":"%s","detach":"%s","gpg":"%s","previous":"%s"}' $(_ak_datetime_unix) $ACTION $MESSAGE_HASH $MESSAGE_SIGNATURE $GPG_PUB_KEY $PREVIOUS > block
     BLOCK="block"
     BLOCK_SIG=$BLOCK".asc"
     # We have a block now, so we sign it
@@ -614,7 +615,7 @@ function _ak_zblock_repack(){
     # Optional or extending with
     # python send_as_ak_tx $ZBLOCK
     # or for "offline" use
-    archivaltime="$(date -u +%s)"
+    archivaltime="$(_ak_datetime_unix)"
     echo "${archivaltime} $(cat $AK_ZLATEST)" >> $AK_ZLATEST_HISTORY
     echo $ZBLOCK > $AK_ZLATEST
     _ak_ipfs_name_publish zchain /ipfs/$ZBLOCK #> /dev/null 2>&1
@@ -694,7 +695,7 @@ function _ak_zblock_pack(){
             # Acquire last block of information, to chain this one with previous posted
             PREVIOUS="$(cat $AK_ZLATEST)"
             # We create a block of json like this:
-            printf '{"timestamp":"%s","action":"%s","data":"%s","detach":"%s","gpg":"%s","previous":"%s"}' "$(date -u +%s)" "$ACTION" "$MESSAGE_HASH" "$MESSAGE_SIGNATURE" "$GPG_PUB_KEY" "$PREVIOUS" > block
+            printf '{"timestamp":"%s","action":"%s","data":"%s","detach":"%s","gpg":"%s","previous":"%s"}' "$(_ak_datetime_unix)" "$ACTION" "$MESSAGE_HASH" "$MESSAGE_SIGNATURE" "$GPG_PUB_KEY" "$PREVIOUS" > block
             BLOCK="block"
             BLOCK_SIG="${BLOCK}.asc"
             # We have a block now, so we sign it
@@ -717,7 +718,7 @@ function _ak_zblock_pack(){
         # Optional or extending with
         # python send_as_ak_tx $ZBLOCK
         # or for "offline" use
-        archivaltime="$(date -u +%s)"
+        archivaltime="$(_ak_datetime_unix)"
         echo "${archivaltime} $(cat $AK_ZLATEST)" >> $AK_ZLATEST_HISTORY
         echo $ZBLOCK > $AK_ZLATEST
         _ak_ipfs_name_publish zchain /ipfs/$ZBLOCK > /dev/null 2>&1
-- 
cgit v1.2.3