diff --git a/separator.sh b/separator.sh index 480da4a..6c098b0 100755 --- a/separator.sh +++ b/separator.sh @@ -34,11 +34,15 @@ hourBreakdown () { 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-$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"; + 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-$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"; + 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 } @@ -46,30 +50,48 @@ hourBreakdown () { dailyBreakdown () { lm=$1; # Light Meter (either 1 or 2) mkdir -p "data/light-meter-$lm"; - for month in {6..8} ; do + for month in {6..7} ; do for day in {1..31} ; do - if [[ $day -lt 10 ]]; then - 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/lm$lm-exhibiton-all.csv" >> "data/light-meter-$lm/2021-0$month-0$day.csv"; - if [[ $month -lt 10 ]]; then - hourBreakdown "0$day" "0$month" $lm; + # June is 30 days long, hence the check (and skip). + if [[ $day != 31 ]] && [[ $month != "06" ]]; then + if [[ $day -lt 10 ]]; then + 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/lm$lm-exhibiton-all.csv" \ + >> "data/light-meter-$lm/2021-0$month-0$day.csv"; + if [[ $month -lt 10 ]]; then + hourBreakdown "0$day" "0$month" $lm; + else + hourBreakdown "0$day" $month $lm; + fi else - hourBreakdown "0$day" $month $lm; - fi - else - 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/lm$lm-exhibiton-all.csv" >> "data/light-meter-$lm/2021-0$month-$day.csv"; - if [[ $month -lt 10 ]]; then - hourBreakdown $day "0$month" $lm; - else - hourBreakdown $day $month $lm; + 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/lm$lm-exhibiton-all.csv" \ + >> "data/light-meter-$lm/2021-0$month-$day.csv"; + if [[ $month -lt 10 ]]; then + hourBreakdown $day "0$month" $lm; + else + hourBreakdown $day $month $lm; + fi fi fi done done } +removeExcessData () { + for day in {1..12}; do + if [[ $day -lt 10 ]]; then d="0$day"; else d=$day; fi + rm -r "data/light-meter-1/2021-06-$d" + rm "data/light-meter-1/2021-06-$d.csv" + rm -r "data/light-meter-2/2021-06-$d" + rm "data/light-meter-2/2021-06-$d.csv" +done +} + dailyBreakdown "1"; # Light Meter 1 dailyBreakdown "2"; # Light Meter 2 +removeExcessData;