Update status.cgi - reduce /configs use and split TZ

This commit is contained in:
virmaior 2024-02-17 23:31:24 +09:00 committed by gtxaspec
parent 255e672603
commit 84e63535fd

View File

@ -1,11 +1,9 @@
#!/bin/sh #!/bin/sh
# This serves a rudimentary webpage to test different items # This serves a rudimentary webpage to test different features of the camera
. /opt/wz_mini/www/cgi-bin/shared.cgi . /opt/wz_mini/www/cgi-bin/shared.cgi
gpiopath="/sys/devices/virtual/gpio"
base='/opt/record/';
TZ=$(cat /configs/TZ)
echo "tz: $TZ"
test_gpio() test_gpio()
{ {
@ -57,6 +55,7 @@ test_recording()
{ {
msg="" msg=""
utchour=$(TZ="UTC" date +"%H")
fpath=$(TZ="$TZ" date +"%Y%m%d") fpath=$(TZ="$TZ" date +"%Y%m%d")
nowmin=$(TZ="$TZ" date +"%M") nowmin=$(TZ="$TZ" date +"%M")
curmin=$((10#$nowmin - 1)) curmin=$((10#$nowmin - 1))
@ -64,6 +63,10 @@ curhour=$(TZ="$TZ" date +"%H")
cursec=$(TZ="$TZ" date +"%S") cursec=$(TZ="$TZ" date +"%S")
if [[ "$utchour" == "$curhour" ]]; then
echo "TZ is returning UTC (Possible parsing error?) $utcnow $tznow"
fi
if [[ "$cursec" -lt "03" ]]; then if [[ "$cursec" -lt "03" ]]; then
wt=$((3 - $cursec)) wt=$((3 - $cursec))
msg="delayed $wt seconds to allow copy to SD" msg="delayed $wt seconds to allow copy to SD"
@ -83,32 +86,30 @@ fi
curmin=$(printf %02d $curmin) curmin=$(printf %02d $curmin)
if [ ! -d "$base$fpath" ]; then if [ ! -d "$recpath$fpath" ]; then
echo -e "NG $lb" echo -e "NG $lb"
echo "Date directory does not exist ($base$fname)" echo "Date directory does not exist ($recpath$fpath)"
exit
fi
if [ ! -d "$recpath$fpath/$curhour" ]; then
echo -e "NG $lb"
echo "Hour directory does not exist ($recpath$fpath/$curhour)"
exit exit
fi fi
if [ ! -f "$recpath$fpath/$curhour/$curmin.mp4" ]; then
if [ ! -d "$base$fpath/$curhour" ]; then
echo -e "NG $lb" echo -e "NG $lb"
echo "Hour directory does not exist ($base$fname/$curhour)" echo "Last minute not recorded ($recpath$fpath/$curhour/$curmin.mp4)"
exit
fi
if [ ! -f "$base$fpath/$curhour/$curmin.mp4" ]; then
echo -e "NG $lb"
echo "Last minute not recorded ($base$fname/$curhour/$curmin.mp4)"
exit exit
fi fi
echo "OK$lb" echo "OK$lb"
echo found "$base$fpath/$curhour/$curmin.mp4" echo found "$recpath$fpath/$curhour/$curmin.mp4"
echo $msg echo $msg
} }