diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh index e5b296b..7b44627 100755 --- a/scripts/birdnet_recording.sh +++ b/scripts/birdnet_recording.sh @@ -6,10 +6,10 @@ if pgrep arecord &> /dev/null ;then echo "Recording" else if [ -z ${REC_CARD} ];then - arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 10\ + arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 9\ --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%I:%M:%S%P.wav else - arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 10\ + arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 9\ -D "${REC_CARD}" --use-strftime \ ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%I:%M:%S%P.wav fi diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh index 23d10ee..c018d8e 100755 --- a/scripts/extract_new_birdsounds.sh +++ b/scripts/extract_new_birdsounds.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Exit when any command fails -#set -x +set -x set -e # Keep track of the last executed command trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG @@ -55,16 +55,20 @@ for h in "${SCAN_DIRS[@]}";do while read -r line;do a=$a DATE="$(echo "${line}" \ - | awk -F- '/birdnet/{print $1"-"$2"-"$3}')" + | awk -F- '/birdnet/{print $1"-"$2"-"$3}')" if [ ! -z ${DATE} ];then OLDFILE="$(echo "${line}" | awk -F. '/birdnet/{print $1"."$2}')" ; continue fi + + if [ -z ${DATE} ];then + DATE=$(date "+%F") + fi START="$(echo "${line}" | awk -F\; '!/birdnet/{print $1}')" END="$(echo "${line}" | awk -F\; '!/birdnet/{print $2}')" COMMON_NAME=""$(echo ${line} \ - | awk -F\; '!/birdnet/{print $4}')"" + | awk -F\; '!/birdnet/{print $4}')"" SCIENTIFIC_NAME=""$(echo ${line} \ - | awk -F\; '!/birdnet/{print $3}')"" + | awk -F\; '!/birdnet/{print $3}')"" NEWFILE="${COMMON_NAME// /_}-${OLDFILE}" NEWSPECIES_BYDATE="${EXTRACTED}/By_Date/${DATE}/${COMMON_NAME// /_}" NEWSPECIES_BY_COMMON="${EXTRACTED}/By_Common_Name/${COMMON_NAME// /_}"