From bd80a6f88a2211a4ed111d6830c6288fa6b850c8 Mon Sep 17 00:00:00 2001 From: Craig Oates Date: Mon, 20 Mar 2023 20:25:38 +0000 Subject: [PATCH] add code to select which Light Meter data to process. You can now pass either a '1' or '2' to select which Light Meter data you want to process -- all in the same script. This allows you to process both sets of data at the same time. Each Meters' data is place in their own directory in data/ so you can work on each one seperately without mixing them up. --- seperator.sh | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/seperator.sh b/seperator.sh index 64ff4c5..d39c9aa 100755 --- a/seperator.sh +++ b/seperator.sh @@ -8,38 +8,44 @@ singleBreakdown () { hourBreakdown () { d="$1"; # Day m="$2"; # Month - # echo "Day: $d | Month: $m"; - mkdir "data/light-meter-1/2021-$m-$d"; + mtr="$3"; # Light Meter (either 1 or 2) + # echo "Day: $d | Month: $m | Meter: $mtr"; + mkdir -p "data/light-meter-$mtr/2021-$m-$d"; for hour in {0..24}; do if [[ $hour -lt 10 ]]; then - echo "time,reading" > "data/light-meter-1/2021-$m-$d/2021-$m-$d--0$hour.csv"; - rg "2021-$m-$d 0$hour:" "data/light-meter-1/2021-$m-$d.csv" >> "data/light-meter-1/2021-$m-$d/2021-$m-$d--0$hour.csv"; + echo "time,reading" > "data/light-meter-$mtr/2021-$m-$d/2021-$m-$d--0$hour.csv"; + rg "2021-$m-$d 0$hour:" "data/light-meter-$mtr/2021-$m-$d.csv" >> "data/light-meter-$mtr/2021-$m-$d/2021-$m-$d--0$hour.csv"; else - echo "time,reading" > "data/light-meter-1/2021-$m-$d/2021-$m-$d--$hour.csv"; - rg "2021-$m-$d $hour:" "data/light-meter-1/2021-$m-$d.csv" >> "data/light-meter-1/2021-$m-$d/2021-$m-$d--$hour.csv"; + echo "time,reading" > "data/light-meter-$mtr/2021-$m-$d/2021-$m-$d--$hour.csv"; + rg "2021-$m-$d $hour:" "data/light-meter-$mtr/2021-$m-$d.csv" >> "data/light-meter-$mtr/2021-$m-$d/2021-$m-$d--$hour.csv"; fi done } -dailyBreakdown () { +dailyBreakdown () { + lm="$1"; # Light Meter (either 1 or 2) + mkdir -p "data/light-meter-$lm"; for month in {6..8} ; do for day in {1..31} ; do - # echo "2021-0$month-$day"; + # echo "2021-0$month-$day Meter: $1"; + # hourBreakdown $day $month $lm; if [[ $day -lt 10 ]]; then - echo "time,reading" > "data/light-meter-1/2021-0$month-0$day.csv"; - rg "2021-0$month-0$day" "data/lm1-exhibiton-all.csv" >> "data/light-meter-1/2021-0$month-0$day.csv"; + touch "data/light-meter-$lm/2021-0$month-0$day.csv"; + echo "time,reading" > "data/light-meter-$lm/2021-0$month-0$day.csv"; + rg "2021-0$month-0$day" "data/lm1-exhibiton-all.csv" >> "data/light-meter-$lm/2021-0$month-0$day.csv"; if [[ $month -lt 10 ]]; then - hourBreakdown "0$day" "0$month"; + hourBreakdown "0$day" "0$month" $lm; else - hourBreakdown "0$day" "$month"; + hourBreakdown "0$day" $month $lm; fi else - echo "time,reading" > "data/light-meter-1/2021-0$month-$day.csv"; - rg "2021-0$month-$day" "data/lm1-exhibiton-all.csv" >> "data/light-meter-1/2021-0$month-$day.csv"; + touch "data/light-meter-$lm/2021-0$month-$day.csv"; + echo "time,reading" > "data/light-meter-$lm/2021-0$month-$day.csv"; + rg "2021-0$month-$day" "data/lm1-exhibiton-all.csv" >> "data/light-meter-$lm/2021-0$month-$day.csv"; if [[ $month -lt 10 ]]; then - hourBreakdown "$day" "0$month"; + hourBreakdown $day "0$month" $lm; else - hourBreakdown "$day" "$month"; + hourBreakdown $day $month $lm; fi fi done @@ -47,5 +53,6 @@ dailyBreakdown () { } # singleBreakdown -dailyBreakdown +dailyBreakdown "1"; +dailyBreakdown "2"; # hourBreakdown