From ae3e29ef1d922f349e86c74a313931bc12ecebbc Mon Sep 17 00:00:00 2001 From: Patrick McGuire Date: Fri, 15 Oct 2021 19:48:39 -0400 Subject: [PATCH] seems to work --- scripts/extract_new_birdsounds.sh | 2 +- scripts/species_notifier.sh | 10 +++---- scripts/spectrogram.sh | 2 +- scripts/viewdb.php | 50 +++++++++++++++++++++++++++---- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh index 15b9e2e..8353385 100755 --- a/scripts/extract_new_birdsounds.sh +++ b/scripts/extract_new_birdsounds.sh @@ -129,7 +129,7 @@ for h in "${SCAN_DIRS[@]}";do "${NEWSPECIES_BYDATE}/${NEWFILE}" # Create spectrogram for extraction - sox "${NEWSPECIES_BYDATE}/${NEWFILE}" -n remix 1 rate 20k spectrogram \ + sox "${NEWSPECIES_BYDATE}/${NEWFILE}" -n remix 1 rate 24k spectrogram \ -t "${COMMON_NAME}" \ -c "${NEWSPECIES_BYDATE}/${NEWFILE}" \ -o "${NEWSPECIES_BYDATE}/${NEWFILE}.png" diff --git a/scripts/species_notifier.sh b/scripts/species_notifier.sh index 620d93e..8c2d30d 100755 --- a/scripts/species_notifier.sh +++ b/scripts/species_notifier.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash # Sends a notification if a new species is detected #set -x -trap 'rm -f $TMPFILE' EXIT +trap 'rm -f $tmpids' EXIT source /etc/birdnet/birdnet.conf -TMPFILE=$(mktemp) +tmpids=$(mktemp) [ -f ${IDFILE} ] || touch ${IDFILE} -cat "${IDFILE}" > "${TMPFILE}" +cat "${IDFILE}" > "${tmpids}" /usr/local/bin/update_species.sh > /dev/null -if ! diff "${IDFILE}" "${TMPFILE}" &> /dev/null; then - SPECIES=("$(diff "${IDFILE}" "${TMPFILE}" \ +if ! diff "${IDFILE}" "${tmpids}" &> /dev/null; then + SPECIES=("$(diff "${IDFILE}" "${tmpids}" \ | grep "Common Name" \ | sort \ | awk '{for(i=4;i<=NF;++i)printf $i""FS ; print ""}')") diff --git a/scripts/spectrogram.sh b/scripts/spectrogram.sh index 50f84c0..db36975 100755 --- a/scripts/spectrogram.sh +++ b/scripts/spectrogram.sh @@ -4,4 +4,4 @@ source /etc/birdnet/birdnet.conf analyzing_now="$(cat /home/pi/BirdNET-Pi/analyzing_now.txt)" spectrogram_png=${EXTRACTED}/spectrogram.png #sudo -u pi sox "${analyzing_now}" -n spectrogram -t "Currently Analyzing" -c "${analyzing_now}" -o "${spectrogram_png}" -sudo -u pi sox "${analyzing_now}" -n remix 1 rate 20k spectrogram -t "Currently Analyzing" -c "${analyzing_now}" -o "${spectrogram_png}" +sudo -u pi sox "${analyzing_now}" -n remix 1 rate 24k spectrogram -t "Currently Analyzing" -c "${analyzing_now}" -o "${spectrogram_png}" diff --git a/scripts/viewdb.php b/scripts/viewdb.php index 9703232..ac70b0f 100644 --- a/scripts/viewdb.php +++ b/scripts/viewdb.php @@ -53,14 +53,10 @@ $mysqli->close(); + BirdNET-Pi DB