From 92cd6a2051af06bdbd884dc8a8c4b5cbd99591c9 Mon Sep 17 00:00:00 2001
From: olli <olli@gabosh.net>
Date: Thu, 1 Jun 2023 13:26:10 +0200
Subject: [PATCH] analyze.sh csv output

---
 dabo/analyze.sh    | 5 ++---
 dabo/dabo-bot.conf | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dabo/analyze.sh b/dabo/analyze.sh
index 1b028ae..531df51 100755
--- a/dabo/analyze.sh
+++ b/dabo/analyze.sh
@@ -45,9 +45,8 @@ function analyze {
     current=$(echo $line | cut -d, -f2)
     time=$(echo $line | cut -d, -f1 | cut -d: -f1,2)
     f_market_performance=$(grep "^$time" data/botdata/MARKET_PERFORMANCE | tail -n1 | cut -d: -f4 | cut -d"%" -f1 | sed 's/ *//')
-    echo "$line" >>${g_tmp}/${tmpfile}
-    echo "${csv_headline},Marketperformance
-${line},${f_market_performance}" | cut -d, -f 2-22 | perl -pe 's/([0-9].[0-9][0-9][0-9][0-9][0-9][0-9])[0-9]+/$1/g' | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, >>${g_tmp}/output-${tmpfile}
+    echo "$line" >>${g_tmp}/${tmpfilea}
+    echo "${line},${f_market_performance}" | perl -pe 's/([0-9].[0-9][0-9][0-9][0-9][0-9][0-9])[0-9]+/$1/g' | column -t -s, >>${g_tmp}/output-${tmpfile}
     if [ -f "${g_tmp}/open-${tmpfile}" ]
     then
       if [ "${ANALYZE_VERBOSE}" -eq "0" ]
diff --git a/dabo/dabo-bot.conf b/dabo/dabo-bot.conf
index d683121..1e48c8d 100755
--- a/dabo/dabo-bot.conf
+++ b/dabo/dabo-bot.conf
@@ -33,6 +33,6 @@ INVEST="5"
 EMERGENCY_STOP="1000"
 
 # Headline - don't touch
-export csv_headline="Date and Time,Price,Change ${INTERVAL}s,EMA12,EMA26,MACD,EMA9 MACD (Signal),MACD Histogram,MACD Signal,RSI5,RSI14,RSI21,RSI720,RSI60,RSI120,RSI240,RSI420,Change 24h,Change 7d,Change 14d,Change 30d"
+export csv_headline="Date and Time,Price,Change,EMA12,EMA26,MACD,EMA9 (Sig.),Histogram,MACD Sig.,RSI5,RSI14,RSI21,RSI720,RSI60,RSI120,RSI240,RSI420,Change 24h,Change 7d,Change 14d,Change 30d"