diff --git a/result.csv b/result.csv index 5e65adc..94718ab 100644 --- a/result.csv +++ b/result.csv @@ -1,21 +1,2 @@ Start (s);End (s);Scientific name;Common name;Confidence -15.0;18.0;Junco hyemalis;Dark-eyed Junco;0.63864714 -19.5;22.5;Poecile atricapillus;Black-capped Chickadee;0.28910682 -21.0;24.0;Junco hyemalis;Dark-eyed Junco;0.2813258 -21.0;24.0;Pipilo maculatus;Spotted Towhee;0.26970756 -22.5;25.5;Junco hyemalis;Dark-eyed Junco;0.36897075 -25.5;28.5;Poecile atricapillus;Black-capped Chickadee;0.36192033 -28.5;31.5;Junco hyemalis;Dark-eyed Junco;0.54385275 -34.5;37.5;Junco hyemalis;Dark-eyed Junco;0.6392924 -43.5;46.5;Junco hyemalis;Dark-eyed Junco;0.395477 -45.0;48.0;Junco hyemalis;Dark-eyed Junco;0.35142577 -49.5;52.5;Junco hyemalis;Dark-eyed Junco;0.36010146 -51.0;54.0;Junco hyemalis;Dark-eyed Junco;0.3235896 -54.0;57.0;Junco hyemalis;Dark-eyed Junco;0.61683154 -55.5;58.5;Junco hyemalis;Dark-eyed Junco;0.30236518 -61.5;64.5;Junco hyemalis;Dark-eyed Junco;0.5145074 -63.0;66.0;Junco hyemalis;Dark-eyed Junco;0.55427563 -66.0;69.0;Poecile atricapillus;Black-capped Chickadee;0.7129054 -67.5;70.5;Junco hyemalis;Dark-eyed Junco;0.4047741 -69.0;72.0;Junco hyemalis;Dark-eyed Junco;0.70841223 -70.5;73.5;Junco hyemalis;Dark-eyed Junco;0.25039598 +0.0;3.0;Columba livia;Rock Pigeon;0.18658808 diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index 560720c..0a46d4a 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -26,7 +26,7 @@ get_files() { move_analyzed() { echo "Starting move_analyzed() for ${1}" for i in "${files[@]}";do - j="$(echo "${i}" | cut -d'.' -f1).BirdNET.selections.txt" + j="$(echo "${i}" | cut -d'.' -f1-2).csv" if [ -f "${1}/${j}" ];then if [ ! -d "${1}-Analyzed" ];then mkdir -vvvvvvvp "${1}-Analyzed" && echo "'Analyzed' directory created" @@ -46,14 +46,17 @@ run_analysis() { echo "Starting run_analysis() for ${1}" WEEK=$(date --date="${2}" +"%U") cd ${HOME}/BirdNET-Lite || exit 1 + FILES=("$(find ${1} | tail -n+2)") + for i in "${files[@]}";do python3 analyze.py \ - --i "${1}" \ - --o "${1}.csv" \ + --i "${1}/${i}" \ + --o "${1}/${i}.csv" \ --lat "${LATITUDE}" \ --lon "${LONGITUDE}" \ --week "${WEEK}" \ --overlap "${OVERLAP}" \ --min_conf "${CONFIDENCE}" + done } # The three main functions diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh index 4ee59c8..82d073f 100755 --- a/scripts/birdnet_recording.sh +++ b/scripts/birdnet_recording.sh @@ -6,11 +6,11 @@ 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 60 \ - --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%I:%M%P.wav + arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 25\ + --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 60 \ + arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time 25\ -D "${REC_CARD}" --use-strftime \ - ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%I:%M%P.wav + ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%I:%M:%S%P.wav fi fi