From e318fea70f7376b8a13fc86fa77d08037c462120 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 25 Aug 2023 16:47:47 +0200
Subject: [PATCH] NX to init

---
 home.admin/_background.scan.sh | 22 +++++++++++-----------
 home.admin/_cache.sh           |  9 +++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/home.admin/_background.scan.sh b/home.admin/_background.scan.sh
index 4df91a4a2..6ff8fec58 100755
--- a/home.admin/_background.scan.sh
+++ b/home.admin/_background.scan.sh
@@ -78,17 +78,17 @@ usermod -G bitcoin root
 ####################################################################
 
 # init values
-/home/admin/_cache.sh set system_temp_celsius "0" NX
-/home/admin/_cache.sh set system_temp_fahrenheit "0" NX
-/home/admin/_cache.sh set system_count_longscan "0" NX
-/home/admin/_cache.sh set system_count_undervoltage "0" NX
-/home/admin/_cache.sh set system_count_start_blockchain "0" NX
-/home/admin/_cache.sh set system_count_start_lightning "0" NX
-/home/admin/_cache.sh set system_count_start_tui "0" NX
-/home/admin/_cache.sh set btc_default_peers "0" NX
-/home/admin/_cache.sh set btc_default_sync_percentage "0" NX
-/home/admin/_cache.sh set btc_default_address "" NX
-/home/admin/_cache.sh set btc_default_port "" NX
+/home/admin/_cache.sh init system_temp_celsius "0"
+/home/admin/_cache.sh init system_temp_fahrenheit "0"
+/home/admin/_cache.sh init system_count_longscan "0"
+/home/admin/_cache.sh init system_count_undervoltage "0"
+/home/admin/_cache.sh init system_count_start_blockchain "0"
+/home/admin/_cache.sh init system_count_start_lightning "0"
+/home/admin/_cache.sh init system_count_start_tui "0"
+/home/admin/_cache.sh init btc_default_peers "0"
+/home/admin/_cache.sh init btc_default_sync_percentage "0"
+/home/admin/_cache.sh init btc_default_address ""
+/home/admin/_cache.sh init btc_default_port ""
 
 # import all base values from raspiblitz.info
 echo "importing: ${infoFile}"
diff --git a/home.admin/_cache.sh b/home.admin/_cache.sh
index 82e8848ed..8c8bc9a27 100755
--- a/home.admin/_cache.sh
+++ b/home.admin/_cache.sh
@@ -14,6 +14,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "-help" ];
   echo "_cache.sh ramdisk [on|off]"
   echo "_cache.sh keyvalue [on|off]"
   echo
+  echo "_cache.sh init [key] [value] (only sets value if not exists)"
   echo "_cache.sh set [key] [value] [?expire-seconds]"
   echo "_cache.sh get [key1] [?key2] [?key3] ..."
   echo
@@ -133,7 +134,7 @@ elif [ "$1" = "keyvalue" ] && [ "$2" = "off" ]; then
 ###################
 
 # set
-elif [ "$1" = "set" ]; then
+elif [ "$1" = "set" ] || [ "$1" = "init" ]; then
 
   # get parameters
   keystr=$2
@@ -148,8 +149,8 @@ elif [ "$1" = "set" ]; then
 
 
   NX=""
-  if [ "${expireOrNx}" == "NX" ]; then
-    NX="NX"
+  if [ "$1" = "init" ]; then
+    NX="NX "
   else
   # filter from expire just numbers
   expireOrNx="${expire//[^0-9.]/}"
@@ -167,7 +168,7 @@ elif [ "$1" = "set" ]; then
 
   # set in redis the timestamp
   timestamp=$(date +%s)
-  redis-cli set ${NX} ${keystr}${META_LASTTOUCH_TS} "${timestamp}" ${additionalParams} 1>/dev/null
+  redis-cli set ${NX}${keystr}${META_LASTTOUCH_TS} "${timestamp}" ${additionalParams} 1>/dev/null
   #echo "# lasttouch(${timestamp})"
 
   # check if the value has a outdate policy