From 1cd1dbeecff875d45815af462f9b63ca919e7ab9 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Mon, 31 Jan 2022 12:34:57 -0500 Subject: [PATCH] rearranging the tools page to add system_controls and service_controls --- scripts/clear_all_data.sh | 48 +++++++++++---------- scripts/index.html | 37 ++++------------ scripts/service_controls.php | 82 ++++++++++++++++++++++++++++++++++++ scripts/system_controls.php | 75 +++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+), 50 deletions(-) create mode 100644 scripts/service_controls.php create mode 100644 scripts/system_controls.php diff --git a/scripts/clear_all_data.sh b/scripts/clear_all_data.sh index de568fb..d58cae1 100755 --- a/scripts/clear_all_data.sh +++ b/scripts/clear_all_data.sh @@ -8,12 +8,12 @@ HOME=/home/pi USER=pi my_dir=${HOME}/BirdNET-Pi/scripts echo "Stopping services" -sudo systemctl stop birdnet_recording.service +/usr/local/bin/stop_core_services.sh echo "Removing all data . . . " sudo rm -drf "${RECS_DIR}" sudo rm -f "${IDFILE}" sudo rm -f $(dirname ${my_dir})/BirdDB.txt -echo "Recreating necessary directories" +echo "Creating necessary directories" [ -d ${EXTRACTED} ] || sudo -u ${USER} mkdir -p ${EXTRACTED} [ -d ${EXTRACTED}/By_Date ] || sudo -u ${USER} mkdir -p ${EXTRACTED}/By_Date [ -d ${EXTRACTED}/By_Common_Name ] || sudo -u ${USER} mkdir -p ${EXTRACTED}/By_Common_Name @@ -24,50 +24,54 @@ echo "Recreating necessary directories" sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED} if [ ! -z ${BIRDNETLOG_URL} ];then BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')" - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html - phpfiles="$(grep -l "birdnetpi.local:8080" ${my_dir}/*.php)" + sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html + phpfiles="$(grep -l "$(hostname).local:8080" ${my_dir}/*.php)" for i in "${phpfiles[@]}";do - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" ${i} + sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" ${i} done fi if [ ! -z ${EXTRACTIONLOG_URL} ];then EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')" - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html - phpfiles="$(grep -l "birdnetpi.local:8888" ${my_dir}/*.php)" + sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html + phpfiles="$(grep -l "$(hostname).local:8888" ${my_dir}/*.php)" for i in "${phpfiles[@]}";do - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" ${i} + sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" ${i} done fi sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED} -if [ ! -z ${BIRDNETPI_URL} ];then +if [ -z ${BIRDNETPI_URL} ];then + sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/homepage/*.html + sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html + sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html + sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.php + sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*/*.php +else BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')" - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local/"${BIRDNETPI_URL}"/g" $(dirname ${my_dir})/homepage/*.html - phpfiles="$(grep -l birdnetpi.local ${my_dir}/*.php)" - for i in "${phpfiles[@]}";do - sudo -u ${USER} sed -i "s/http:\/\/birdnetpi.local/"${BIRDNETPI_URL}"/g" ${i} - done + sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/homepage/*.html + sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html + sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html + sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.php + sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*/*.php fi sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED} -sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewday.php ${EXTRACTED} +sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED} +sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/images/favicon.ico ${EXTRACTED} sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED} sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/phpsysinfo.ini ${HOME}/phpsysinfo/ sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/green_bootstrap.css ${HOME}/phpsysinfo/templates/ sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/index_bootstrap.html ${HOME}/phpsysinfo/templates/html echo "Setting Wttr.in URL to "${LATITUDE}", "${LONGITUDE}"" -sudo -u ${USER} git -C $(dirname ${my_dir}) checkout -f homepage/menu.html -sudo -u ${USER} sed -i "s/https:\/\/v2.wttr.in\//https:\/\/v2.wttr.in\/"${LATITUDE},${LONGITUDE}"/g" $(dirname ${my_dir})/homepage/menu.html +sudo -u${USER} sed -i "s/https:\/\/v2.wttr.in\//https:\/\/v2.wttr.in\/"${LATITUDE},${LONGITUDE}"/g" $(dirname ${my_dir})/homepage/menu.html +chmod -R g+rw $(dirname ${my_dir}) +chmod -R g+rw ${RECS_DIR} -echo "Generating BirdDB.txt" -[ -f $(dirname ${my_dir})/BirdDB.txt ] || sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt -echo "Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap" | sudo -u ${BIRDNET_USER} tee -a $(dirname ${my_dir})/BirdDB.txt -sudo -u ${BIRDNET_USER} cp -f ${HOME}/BirdNET-Pi/homepage/index.html ${EXTRACTED}/ echo "Dropping and re-creating database" sudo /home/pi/BirdNET-Pi/scripts/createdb_bullseye.sh echo "Restarting services" -sudo systemctl restart birdnet_recording.service +/usr/local/bin/restart_services.sh diff --git a/scripts/index.html b/scripts/index.html index 59ad96b..13babaa 100644 --- a/scripts/index.html +++ b/scripts/index.html @@ -68,41 +68,22 @@ a {
+
+
-
- -
-
- -
-
- -
-
- -
-
+
-
- + +
-
- + +
-
- -
-
- -
-
- -
-
- + +
diff --git a/scripts/service_controls.php b/scripts/service_controls.php new file mode 100644 index 0000000..33c6f86 --- /dev/null +++ b/scripts/service_controls.php @@ -0,0 +1,82 @@ + + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ diff --git a/scripts/system_controls.php b/scripts/system_controls.php new file mode 100644 index 0000000..16f419f --- /dev/null +++ b/scripts/system_controls.php @@ -0,0 +1,75 @@ + + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+