From 260402de0de2144b3328110ea4afc0419507e903 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 11:25:22 -0500 Subject: [PATCH 1/6] cleanup old empty birdsongs --- scripts/disk_check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/disk_check.sh b/scripts/disk_check.sh index c47c453..27fef21 100755 --- a/scripts/disk_check.sh +++ b/scripts/disk_check.sh @@ -23,6 +23,7 @@ if [ "${used//%}" -ge 95 ]; then fi ((iter++)) done + find ~/BirdSongs/ -type d -empty -mtime +90 -delete find ${EXTRACTED}/By_Date/ -empty -type d -delete;; #rm -drfv "$(find ${EXTRACTED}/By_Date/* -maxdepth 1 -type d -prune \ From b0676c821755379455bcf4ec1b45417290bb80fd Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:03:49 -0500 Subject: [PATCH 2/6] possible workaround for notorious bug --- scripts/birdnet_analysis.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index edf8100..4d55f99 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -100,7 +100,13 @@ run_analysis() { echo "${1}/${i}" > $HOME/BirdNET-Pi/analyzing_now.txt [ -z ${RECORDING_LENGTH} ] && RECORDING_LENGTH=15 echo "RECORDING_LENGTH set to ${RECORDING_LENGTH}" + itr=0 until [ -z "$(lsof -t ${1}/${i})" ];do + itr=$((itr+1)) + if [ $itr -eq 30 ]; then + echo "Maximum number of attempts exceeded. Exiting & restarting service." + exit + fi sleep 2 done From 16476041220523a1fb29c3a782199af789d0e808 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:15:17 -0500 Subject: [PATCH 3/6] Update birdnet_analysis.sh --- scripts/birdnet_analysis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index 4d55f99..474a757 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -103,7 +103,7 @@ run_analysis() { itr=0 until [ -z "$(lsof -t ${1}/${i})" ];do itr=$((itr+1)) - if [ $itr -eq 30 ]; then + if [ $itr -eq $(($RECORDING_LENGTH * 3)) ]; then echo "Maximum number of attempts exceeded. Exiting & restarting service." exit fi From 5beb812c648c08e3013c906a640f3ee76da7e098 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:51:38 -0500 Subject: [PATCH 4/6] more notorious bug exterminating --- scripts/update_birdnet_snippets.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh index 227ff73..3e6ac2c 100755 --- a/scripts/update_birdnet_snippets.sh +++ b/scripts/update_birdnet_snippets.sh @@ -159,5 +159,10 @@ EOF $HOME/BirdNET-Pi/birdnet/bin/pip3 install apprise==1.2.1 +if ! grep -q 'RuntimeMaxSec=' "$HOME/BirdNET-Pi/templates/birdnet_analysis.service"&>/dev/null; then + sudo -E sed -i '/\[Service\]/a RuntimeMaxSec=3600' "$HOME/BirdNET-Pi/templates/birdnet_analysis.service" + sudo systemctl daemon-reload && restart_services.sh +fi + sudo systemctl daemon-reload restart_services.sh From 6c0fd42525254f877741c253e550ee27bdb56a93 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:57:29 -0500 Subject: [PATCH 5/6] Update update_birdnet_snippets.sh --- scripts/update_birdnet_snippets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh index 3e6ac2c..ab35e2c 100755 --- a/scripts/update_birdnet_snippets.sh +++ b/scripts/update_birdnet_snippets.sh @@ -157,7 +157,7 @@ CREATE INDEX IF NOT EXISTS "detections_Com_Name" ON "detections" ("Com_Name"); CREATE INDEX IF NOT EXISTS "detections_Date_Time" ON "detections" ("Date" DESC, "Time" DESC); EOF -$HOME/BirdNET-Pi/birdnet/bin/pip3 install apprise==1.2.1 +$HOME/BirdNET-Pi/birdnet/bin/pip3 install apprise==1.2.1 >/dev/null if ! grep -q 'RuntimeMaxSec=' "$HOME/BirdNET-Pi/templates/birdnet_analysis.service"&>/dev/null; then sudo -E sed -i '/\[Service\]/a RuntimeMaxSec=3600' "$HOME/BirdNET-Pi/templates/birdnet_analysis.service" From 75bc9918ef5b9e82ac8dba82e22df6b30075e8b2 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:06:56 -0500 Subject: [PATCH 6/6] issue #742 --- scripts/advanced.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/advanced.php b/scripts/advanced.php index 440f16e..2e09f06 100644 --- a/scripts/advanced.php +++ b/scripts/advanced.php @@ -66,13 +66,14 @@ if(isset($_GET['submit'])) { if(isset($_GET["rtsp_stream"])) { $rtsp_stream = str_replace("\r\n", ",", $_GET["rtsp_stream"]); if(strcmp($rtsp_stream,$config['RTSP_STREAM']) !== 0) { - $contents = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=$rtsp_stream", $contents); - $contents2 = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=$rtsp_stream", $contents2); + $contents = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=\"$rtsp_stream\"", $contents); + $contents2 = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=\"$rtsp_stream\"", $contents2); $fh = fopen('/etc/birdnet/birdnet.conf', "w"); $fh2 = fopen("./scripts/thisrun.txt", "w"); fwrite($fh, $contents); fwrite($fh2, $contents2); exec('sudo systemctl restart birdnet_recording.service'); + exec('sudo systemctl restart livestream.service'); } }