From f1ebae64586d23a6a8578489f394c0222ca1403d Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:33:32 -0400
Subject: [PATCH 01/22] rtsp adjustments

---
 scripts/birdnet_recording.sh | 39 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 0798511..68405c5 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -2,29 +2,28 @@
 set -x
 source /etc/birdnet/birdnet.conf
 
-if [ "${TIMESTAMP_FORMAT}" == "12" ];then
-  STAMP="%I:%M:%S%P"
-else
-  STAMP="%H:%M:%S"
-fi
+STAMP="%H:%M:%S"
 
 [ -z $RECORDING_LENGTH ] && RECORDING_LENGTH=15
 
-if ! pulseaudio --check;then pulseaudio --start;fi
-
-if pgrep arecord &> /dev/null ;then
-  echo "Recording"
-else
-  until grep 5050 <(netstat -tulpn 2>&1);do
-    sleep 1
+if [ ! -z $RTSP_STREAM ];then
+  while true;do
+    ffmpeg -i  $RTSP_STREAM -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$STAMP.wav
   done
-  if [ -z ${REC_CARD} ];then
-
-    arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
-      --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
+else
+  if ! pulseaudio --check;then pulseaudio --start;fi
+  if pgrep arecord &> /dev/null ;then
+    echo "Recording"
   else
-    arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
-     -D "${REC_CARD}" --use-strftime \
-     ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
-  fi
+    until grep 5050 <(netstat -tulpn 2>&1);do
+      sleep 1
+    done
+    if [ -z ${REC_CARD} ];then
+      arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
+        --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
+    else
+      arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
+        -D "${REC_CARD}" --use-strftime \
+        ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
+    fi
 fi

From bc9edb8eb1980754189cc20287aadc4d00b0664d Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:54:46 -0400
Subject: [PATCH 02/22] adding RTSP_STREAM variable

---
 birdnet.conf-defaults | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults
index 5863aab..f21fcad 100644
--- a/birdnet.conf-defaults
+++ b/birdnet.conf-defaults
@@ -48,6 +48,13 @@ ICE_PWD=birdnetpi
 
 BIRDNETPI_URL=
 
+#----------------------------  RTSP Stream URL  -------------------------------#
+
+## If RTSP_STREAM is set, the system will use the RTSP stream as its audio
+## source instead of recording its own audio. If this variable is kept empty,
+## BirdNET-Pi will default to recording its own audio.
+
+RTSP_STREAM=
 
 #-------------------  Mobile Notifications via Pushed.co  ---------------------#
 #____________The two variables below enable mobile notifications_______________#

From 0cc8c3491a6c6c903685e4bb9349b0c94f813b2e Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:55:34 -0400
Subject: [PATCH 03/22] Update install_config.sh

---
 scripts/install_config.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/install_config.sh b/scripts/install_config.sh
index cbd29f1..8906ec5 100755
--- a/scripts/install_config.sh
+++ b/scripts/install_config.sh
@@ -61,6 +61,13 @@ ICE_PWD=birdnetpi
 
 BIRDNETPI_URL=
 
+#----------------------------  RTSP Stream URL  -------------------------------#
+
+## If RTSP_STREAM is set, the system will use the RTSP stream as its audio
+## source instead of recording its own audio. If this variable is kept empty,
+## BirdNET-Pi will default to recording its own audio.
+
+RTSP_STREAM=
 
 #-------------------  Mobile Notifications via Pushed.co  ---------------------#
 #____________The two variables below enable mobile notifications_______________#

From 737042b24b3e2d9f76975ce58708711776584bfe Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:57:34 -0400
Subject: [PATCH 04/22] Update update_birdnet.sh

adding the new variable to the update script to make sure it is added to older systems
---
 scripts/update_birdnet.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/update_birdnet.sh b/scripts/update_birdnet.sh
index a48e7d6..dd6e84a 100755
--- a/scripts/update_birdnet.sh
+++ b/scripts/update_birdnet.sh
@@ -18,3 +18,6 @@ fi
 if ! grep PRIVACY_MODE /etc/birdnet/birdnet.conf;then
   sudo -u${USER} echo "PRIVACY_MODE=off" >> /etc/birdnet/birdnet.conf
 fi
+if ! grep RTSP_STREAM /etc/birdnet/birdnet.conf;then
+  sudo -u${USER} echo "RTSP_STREAM=" >> /etc/birdnet/birdnet.conf
+fi

From ce782c4b8350ba9c2925331e19820b48dc14e808 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 25 Apr 2022 09:11:25 -0400
Subject: [PATCH 05/22] Update advanced.php

---
 scripts/advanced.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index a4da847..4a60f71 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -64,6 +64,19 @@ if(isset($_GET['submit'])) {
     }
   }
 
+  if(isset($_GET["rtsp_stream"])) {
+    $rtsp_stream = $_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);
+      $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');
+    }
+  }
+	
   if(isset($_GET["overlap"])) {
     $overlap = $_GET["overlap"];
     if(strcmp($overlap,$config['OVERLAP']) !== 0) {
@@ -201,6 +214,9 @@ if (file_exists('./scripts/thisrun.txt')) {
       <label for="channels">Audio Channels: </label>
       <input name="channels" type="number" min="1" max="32" step="1" value="<?php print($newconfig['CHANNELS']);?>" required/><br>
       <p>Set Channels to the number of channels supported by your sound card. 32 max.</p>
+      <label for="rtsp_stream">RTSP Stream: </label>
+      <input name="rtsp_stream" type="url" value="<?php print($newconfig['RTSP_STREAM']);?>" /><br>
+      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.</p>
       <label for="recording_length">Recording Length: </label>
       <input name="recording_length" oninput="document.getElementsByName('extraction_length')[0].setAttribute('max', this.value);" type="number" min="3" max="60" step="1" value="<?php print($newconfig['RECORDING_LENGTH']);?>" required/><br>
       <p>Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.</p> 

From 6f8e676f4e4b87846c0d0b17ed7085c8ac42f96b Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Mon, 25 Apr 2022 09:29:43 -0400
Subject: [PATCH 06/22] missing fi

---
 scripts/birdnet_recording.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 68405c5..0798a5a 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -26,4 +26,5 @@ else
         -D "${REC_CARD}" --use-strftime \
         ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
     fi
+  fi
 fi

From 5b6d36ba0e970063722ea697f5c3ac35e675dca9 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Mon, 25 Apr 2022 09:31:40 -0400
Subject: [PATCH 07/22] remove STAMP just use `date`

---
 scripts/birdnet_recording.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 0798a5a..e2ea480 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -2,13 +2,11 @@
 set -x
 source /etc/birdnet/birdnet.conf
 
-STAMP="%H:%M:%S"
-
 [ -z $RECORDING_LENGTH ] && RECORDING_LENGTH=15
 
 if [ ! -z $RTSP_STREAM ];then
   while true;do
-    ffmpeg -i  $RTSP_STREAM -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$STAMP.wav
+	  ffmpeg -i  $RTSP_STREAM -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
   done
 else
   if ! pulseaudio --check;then pulseaudio --start;fi
@@ -20,11 +18,11 @@ else
     done
     if [ -z ${REC_CARD} ];then
       arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
-        --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
+	      --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
     else
       arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
         -D "${REC_CARD}" --use-strftime \
-        ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav
+	${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
     fi
   fi
 fi

From 70d08ccf14c63cc4d254b989516728fc8910bd86 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Mon, 25 Apr 2022 09:39:21 -0400
Subject: [PATCH 08/22] adjustments to read from rtsp

---
 scripts/extract_new_birdsounds.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh
index cee339a..482c37b 100755
--- a/scripts/extract_new_birdsounds.sh
+++ b/scripts/extract_new_birdsounds.sh
@@ -13,9 +13,9 @@ source /etc/birdnet/birdnet.conf
 
 # Set Variables
 TMPFILE=$(mktemp)
-ANALYZED=${RECS_DIR}/*/*Analyzed
-# SCAN_DIRS are all directories marked "Analyzed"
-SCAN_DIRS=($(find ${ANALYZED} -type d 2>/dev/null | sort ))
+#ANALYZED=${RECS_DIR}/*/*Analyzed
+#SCAN_DIRS are all directories marked "Analyzed"
+SCAN_DIRS=($(find $HOME -type d -name '*Analyzed' 2>/dev/null | sort ))
 
 for h in "${SCAN_DIRS[@]}";do
   # The TMPFILE is created from each .csv file BirdNET creates
@@ -38,13 +38,14 @@ for h in "${SCAN_DIRS[@]}";do
   for i in $(find ${h} -name '*csv' 2>/dev/null | sort );do 
     # Iterates over each '.csv' file found in each "Analyzed" directory
     # to create the TMPFILE
-    echo "${i}" | cut -d'/' -f7 >> ${TMPFILE}
+    echo "$(basename ${i})" >> ${TMPFILE}
     sort -k1n -t\; "${i}" | awk '!/Start/{print}' >> ${TMPFILE}
   done
 
   # The extraction reads each line of the TMPFILE and sets the variables ffmpeg
   # will use.
   while read -r line;do
+    echo "Line = $line"
     DATE="$(echo "${line}" \
       | awk -F- '/birdnet/{print $1"-"$2"-"$3}')"
     if [ ! -z ${DATE} ];then

From 7c687e5eb26f09ab0c0a1c3a10baa6f99087c6b2 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Mon, 25 Apr 2022 10:19:01 -0400
Subject: [PATCH 09/22] I dont' know how I messed up the first versions so
 badly, but this one is working

---
 scripts/birdnet_recording.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index e2ea480..1f1cd8d 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -18,11 +18,11 @@ else
     done
     if [ -z ${REC_CARD} ];then
       arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
-	      --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
+	      --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%H:%M:%S.wav
     else
       arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
         -D "${REC_CARD}" --use-strftime \
-	${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
+	${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%H:%M:%S.wav
     fi
   fi
 fi

From ff9f3552712c4fbb0066789eebd7555116a7bb3e Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 10:24:23 -0400
Subject: [PATCH 10/22] Update livestream.sh

---
 scripts/livestream.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/livestream.sh b/scripts/livestream.sh
index bdebba7..d081d53 100755
--- a/scripts/livestream.sh
+++ b/scripts/livestream.sh
@@ -4,8 +4,12 @@ source /etc/birdnet/birdnet.conf
 
 if [ -z ${REC_CARD} ];then
   echo "Stream not supported"
-else
-  ffmpeg -loglevel 52 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
+elif [[ ! -z ${RTSP_STREAM} ]];then
+  ffmpeg -loglevel 52 -ac ${CHANNELS} -i ${RTSP_STREAM} -acodec libmp3lame \
     -b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
     -f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
-fi
+else
+	ffmpeg -loglevel 52 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
+    -b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
+    -f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
+fi
\ No newline at end of file

From 256b405c214be6ee7fdeeb6097018a5eb7b041bf Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:51:04 -0400
Subject: [PATCH 11/22] Allowing multiple RTSP stream urls

(untested)
---
 scripts/advanced.php         | 18 +++++++++---------
 scripts/birdnet_recording.sh |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index 4a60f71..204dd0a 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -65,7 +65,7 @@ if(isset($_GET['submit'])) {
   }
 
   if(isset($_GET["rtsp_stream"])) {
-    $rtsp_stream = $_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);
@@ -76,7 +76,7 @@ if(isset($_GET['submit'])) {
       exec('sudo systemctl restart birdnet_recording.service');
     }
   }
-	
+  
   if(isset($_GET["overlap"])) {
     $overlap = $_GET["overlap"];
     if(strcmp($overlap,$config['OVERLAP']) !== 0) {
@@ -121,14 +121,14 @@ if(isset($_GET['submit'])) {
       $contents2 = preg_replace("/PRIVACY_MODE=.*/", "PRIVACY_MODE=$privacy_mode", $contents2);
       if(strcmp($privacy_mode,"on") == 0) {
         exec('sudo sed -i \'s/\/usr\/local\/bin\/server.py/\/usr\/local\/bin\/privacy_server.py/g\' ../../BirdNET-Pi/templates/birdnet_server.service');
-	      exec('sudo systemctl daemon-reload');
-	      exec('restart_services.sh');
-	      header('Location: /log');
+        exec('sudo systemctl daemon-reload');
+        exec('restart_services.sh');
+        header('Location: /log');
       } elseif(strcmp($privacy_mode,"off") == 0) {
         exec('sudo sed -i \'s/\/usr\/local\/bin\/privacy_server.py/\/usr\/local\/bin\/server.py/g\' ../../BirdNET-Pi/templates/birdnet_server.service');
-	      exec('sudo systemctl daemon-reload');
-	      exec('restart_services.sh');
-	      header('Location: /log');
+        exec('sudo systemctl daemon-reload');
+        exec('restart_services.sh');
+        header('Location: /log');
       }
     }
   }
@@ -215,7 +215,7 @@ if (file_exists('./scripts/thisrun.txt')) {
       <input name="channels" type="number" min="1" max="32" step="1" value="<?php print($newconfig['CHANNELS']);?>" required/><br>
       <p>Set Channels to the number of channels supported by your sound card. 32 max.</p>
       <label for="rtsp_stream">RTSP Stream: </label>
-      <input name="rtsp_stream" type="url" value="<?php print($newconfig['RTSP_STREAM']);?>" /><br>
+      <textarea name="rtsp_stream" type="url" ><?php print( str_replace(",", "\r\n", $newconfig['RTSP_STREAM']));?></textarea><br>
       <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.</p>
       <label for="recording_length">Recording Length: </label>
       <input name="recording_length" oninput="document.getElementsByName('extraction_length')[0].setAttribute('max', this.value);" type="number" min="3" max="60" step="1" value="<?php print($newconfig['RECORDING_LENGTH']);?>" required/><br>
diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 1f1cd8d..ccd1024 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -6,7 +6,9 @@ source /etc/birdnet/birdnet.conf
 
 if [ ! -z $RTSP_STREAM ];then
   while true;do
-	  ffmpeg -i  $RTSP_STREAM -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
+    for i in ${RTSP_STREAM//,/ };do
+      ffmpeg -i  ${i} -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav </dev/null > /dev/null 2>&1 & sleep 1;
+    done
   done
 else
   if ! pulseaudio --check;then pulseaudio --start;fi

From 8864bdf280f41ccbc353516f56d6d8d34c43386f Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:53:30 -0400
Subject: [PATCH 12/22] Update advanced.php

---
 scripts/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index 204dd0a..b73bfbe 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -216,7 +216,7 @@ if (file_exists('./scripts/thisrun.txt')) {
       <p>Set Channels to the number of channels supported by your sound card. 32 max.</p>
       <label for="rtsp_stream">RTSP Stream: </label>
       <textarea name="rtsp_stream" type="url" ><?php print( str_replace(",", "\r\n", $newconfig['RTSP_STREAM']));?></textarea><br>
-      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.</p>
+      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. If you have multiple streams, each URL should be on its own line.</p>
       <label for="recording_length">Recording Length: </label>
       <input name="recording_length" oninput="document.getElementsByName('extraction_length')[0].setAttribute('max', this.value);" type="number" min="3" max="60" step="1" value="<?php print($newconfig['RECORDING_LENGTH']);?>" required/><br>
       <p>Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.</p> 

From 5fa1048acea5b0794b03876bccdc23f1b5cbf88d Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 2 May 2022 09:39:14 -0400
Subject: [PATCH 13/22] Improvements to search, moving styles to .css

---
 homepage/style.css            | 18 ++++++++++++++++++
 scripts/todays_detections.php | 16 ++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/homepage/style.css b/homepage/style.css
index 618fb92..6469e1c 100644
--- a/homepage/style.css
+++ b/homepage/style.css
@@ -513,3 +513,21 @@ button:hover {
   padding:5px;
   border: 2px solid black;
 }
+button.legacyview {
+  color:gray;
+  margin:5px;
+  float:right;
+  z-index:100;
+  position:relative;
+  font-size:small;
+  background:#dbffeb;
+  padding:5px;
+  border: 2px solid black;
+}
+button.loadmore {
+  margin-top:10px;
+  font-size:x-large;
+  background:#dbffeb;
+  padding:10px;
+  border: 2px solid black;
+}
diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index 4b97c71..07e2dcd 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -112,7 +112,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
   // don't show the button if there's no more detections to be displayed, we're at the end of the list
   if($iterations >= 40 && isset($_GET['display_limit']) && is_numeric($_GET['display_limit'])) { ?>
   <center>
-  <button style="margin-top:10px;font-size:x-large;background:#dbffeb;padding:10px;border: 2px solid black;" onclick="loadDetections(<?php echo $_GET['display_limit'] + 40; ?>, this);" value="Today's Detections">Load 40 More...</button>
+  <button class="loadmore" onclick="loadDetections(<?php echo $_GET['display_limit'] + 40; ?>, this);" value="Today's Detections">Load 40 More...</button>
   </center>
   <?php }
 
@@ -156,11 +156,11 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
       </tr>
     </table>
 
-    <h3>Today's Detections — <input size="11" type="text" placeholder="Search..." id="searchterm" name="searchterm"></h3>
+    <h3>Today's Detections — <input autocomplete="off" size="11" type="text" placeholder="Search..." id="searchterm" name="searchterm"></h3>
 
     <div style="padding-bottom:10px" id="detections_table"></div>
 
-    <button onclick="switchViews(this);" style="color:gray;margin:5px;float:right;z-index:100;position:relative;font-size:small;background:#dbffeb;padding:5px;border: 2px solid black;">Legacy view</button>
+    <button onclick="switchViews(this);" class="legacyview">Legacy view</button>
 
 </div>
 
@@ -169,7 +169,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
 var timer = '';
 searchterm = "";
 
-document.getElementById("searchterm").oninput = (function(e) {
+document.getElementById("searchterm").onkeydown = (function(e) {
   if (e.key === "Enter") {
       clearTimeout(timer);
       searchDetections(document.getElementById("searchterm").value);
@@ -178,7 +178,11 @@ document.getElementById("searchterm").oninput = (function(e) {
      clearTimeout(timer);
      timer = setTimeout(function() {
         searchDetections(document.getElementById("searchterm").value);
-        document.getElementById("searchterm").blur();
+
+        setTimeout(function() {
+            // search auto submitted and now the user is probably scrolling, get the keyboard out of the way & prevent browser from jumping to the top when a video is played
+            document.getElementById("searchterm").blur();
+        }, 2000);
      }, 1000);
   }
 });
@@ -194,7 +198,7 @@ function switchViews(element) {
   }
 }
 function searchDetections(searchvalue) {
-    document.getElementById("detections_table").innerHTML = "";
+    document.getElementById("detections_table").innerHTML = "<h3>Loading...</h3>";
     searchterm = searchvalue;
     loadDetections(40,undefined);
 }

From dd738de3f6ff637c80674b94759edd676a3d25da Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Mon, 2 May 2022 10:18:33 -0400
Subject: [PATCH 14/22] Update todays_detections.php

---
 scripts/todays_detections.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index 07e2dcd..1b4db75 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -89,7 +89,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
   ?>
         <?php if(isset($_GET['display_limit']) && is_numeric($_GET['display_limit'])){ ?>
           <tr class="relative" id="<?php echo $iterations; ?>">
-          <td><a target="_blank" href="index.php?filename=<?php echo $todaytable['File_Name']; ?>"><img class="copyimage" width=25 src="images/copy.png"></a><?php echo $todaytable['Time'];?><br>
+          <td class="relative"><a target="_blank" href="index.php?filename=<?php echo $todaytable['File_Name']; ?>"><img class="copyimage" width=25 src="images/copy.png"></a><?php echo $todaytable['Time'];?><br>
           <b><a class="a2" href="https://allaboutbirds.org/guide/<?php echo $comname;?>" target="top"><?php echo $todaytable['Com_Name'];?></a></b><br>
           <a class="a2" href="https://wikipedia.org/wiki/<?php echo $sciname;?>" target="top"><i><?php echo $todaytable['Sci_Name'];?></i></a><br>
           <b>Confidence:</b> <?php echo $todaytable['Confidence'];?><br>

From 1f9a104be4be0c11786fb4e4c7a80eb3d2d530ad Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Tue, 3 May 2022 11:05:25 -0400
Subject: [PATCH 15/22] Update overview.php

This makes it so overview always shows the most recent detection (and not a blank div), by selecting the newest detection that also has a valid image.
---
 scripts/overview.php | 99 ++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 8328913..35cb628 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -10,65 +10,66 @@ if($db == False) {
 
 if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isset($_GET['previous_detection_identifier'])) {
 
-  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 1');
+  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 50');
   if($statement4 == False) {
     echo "Database is busy";
     header("refresh: 0;");
   }
   $result4 = $statement4->execute();
-  $mostrecent = $result4->fetchArray(SQLITE3_ASSOC);
-  $comname = preg_replace('/ /', '_', $mostrecent['Com_Name']);
-  $sciname = preg_replace('/ /', '_', $mostrecent['Sci_Name']);
-  $comname = preg_replace('/\'/', '', $comname);
-  $filename = "/By_Date/".$mostrecent['Date']."/".$comname."/".$mostrecent['File_Name'];
+  // hopefully one of the 5 most recent detections has an image that is valid, we'll use that one as the most recent detection until the newer ones get their images created
+  while($mostrecent = $result4->fetchArray(SQLITE3_ASSOC)) {
+    $comname = preg_replace('/ /', '_', $mostrecent['Com_Name']);
+    $sciname = preg_replace('/ /', '_', $mostrecent['Sci_Name']);
+    $comname = preg_replace('/\'/', '', $comname);
+    $filename = "/By_Date/".$mostrecent['Date']."/".$comname."/".$mostrecent['File_Name'];
 
-
-  if($_GET['previous_detection_identifier'] != $filename || $_GET['previous_detection_identifier'] == "undefined") {
-    // check to make sure the image actually exists, sometimes it takes a minute to be created
-    if (isset($_SERVER['HTTPS']) &&
-        ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) ||
-        isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
-        $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
-      $protocol = 'https://';
-    }
-    else {
-      $protocol = 'http://';
-    }
-    $headers = @get_headers($protocol.$_SERVER['HTTP_HOST'].$filename.".png");
-    if(strpos($headers[0],'200')) {
-    ?>
-      <style>
-      .fade-in {
-        opacity: 1;
-        animation-name: fadeInOpacity;
-        animation-iteration-count: 1;
-        animation-timing-function: ease-in;
-        animation-duration: 1s;
+      // check to make sure the image actually exists, sometimes it takes a minute to be created
+      if (isset($_SERVER['HTTPS']) &&
+          ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) ||
+          isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
+          $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
+        $protocol = 'https://';
       }
-
-      @keyframes fadeInOpacity {
-        0% {
-          opacity: 0;
-        }
-        100% {
+      else {
+        $protocol = 'http://';
+      }
+      $headers = @get_headers($protocol.$_SERVER['HTTP_HOST'].$filename.".png");
+      // we've found our valid detection! ignore everything else from the database loop
+      if(strpos($headers[0],'200')) {
+          if($_GET['previous_detection_identifier'] == $filename) { die(); }
+      ?>
+        <style>
+        .fade-in {
           opacity: 1;
+          animation-name: fadeInOpacity;
+          animation-iteration-count: 1;
+          animation-timing-function: ease-in;
+          animation-duration: 1s;
         }
+
+        @keyframes fadeInOpacity {
+          0% {
+            opacity: 0;
+          }
+          100% {
+            opacity: 1;
+          }
+        }
+        </style>
+        <table class="<?php echo ($_GET['previous_detection_identifier'] == 'undefined') ? '' : 'fade-in';  ?>">
+          <h3>Most Recent Detection: <span style="font-weight: normal;"><?php echo $mostrecent['Date']." ".$mostrecent['Time'];?></span></h3>
+          <tr>
+            <td class="relative"><a target="_blank" href="index.php?filename=<?php echo $mostrecent['File_Name']; ?>"><img class="copyimage" width="25" height="25" src="images/copy.png"></a>
+            <form action="" method="GET">
+                <input type="hidden" name="view" value="Species Stats">
+                <button type="submit" name="species" value="<?php echo $mostrecent['Com_Name'];?>"><?php echo $mostrecent['Com_Name'];?></button></br>
+                <a href="https://wikipedia.org/wiki/<?php echo $sciname;?>" target="_blank"/><i><?php echo $mostrecent['Sci_Name'];?></i></a>
+                <br>Confidence: <?php echo $mostrecent['Confidence'];?><br>
+                <video style="margin-top:10px" onplay='setLiveStreamVolume(0)' onended='setLiveStreamVolume(1)' onpause='setLiveStreamVolume(1)' controls poster="<?php echo $filename.".png";?>" preload="none" title="<?php echo $filename;?>"><source src="<?php echo $filename;?>"></video></td>
+            </form>
+          </tr>
+        </table> <?php break;
       }
-      </style>
-      <table class="<?php echo ($_GET['previous_detection_identifier'] == 'undefined') ? '' : 'fade-in';  ?>">
-        <h3>Most Recent Detection: <span style="font-weight: normal;"><?php echo $mostrecent['Date']." ".$mostrecent['Time'];?></span></h3>
-        <tr>
-          <td class="relative"><a target="_blank" href="index.php?filename=<?php echo $mostrecent['File_Name']; ?>"><img class="copyimage" width="25" height="25" src="images/copy.png"></a>
-          <form action="" method="GET">
-              <input type="hidden" name="view" value="Species Stats">
-              <button type="submit" name="species" value="<?php echo $mostrecent['Com_Name'];?>"><?php echo $mostrecent['Com_Name'];?></button></br>
-              <a href="https://wikipedia.org/wiki/<?php echo $sciname;?>" target="_blank"/><i><?php echo $mostrecent['Sci_Name'];?></i></a>
-              <br>Confidence: <?php echo $mostrecent['Confidence'];?><br>
-              <video style="margin-top:10px" onplay='setLiveStreamVolume(0)' onended='setLiveStreamVolume(1)' onpause='setLiveStreamVolume(1)' controls poster="<?php echo $filename.".png";?>" preload="none" title="<?php echo $filename;?>"><source src="<?php echo $filename;?>"></video></td>
-          </form>
-        </tr>
-      </table> <?php
-    }
   }
   die();
 }

From fc6cf7bd84975d35502f70ece65e134a458a7a53 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Tue, 3 May 2022 12:03:23 -0400
Subject: [PATCH 16/22] Typo

---
 scripts/overview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 35cb628..d45d588 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -10,7 +10,7 @@ if($db == False) {
 
 if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isset($_GET['previous_detection_identifier'])) {
 
-  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 50');
+  $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 5');
   if($statement4 == False) {
     echo "Database is busy";
     header("refresh: 0;");

From 3705334570646aa000598ce2e51e05f2068b6ed4 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Thu, 5 May 2022 07:56:17 -0400
Subject: [PATCH 17/22] Midnight bug redux

---
 scripts/birdnet_analysis.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh
index 3edfe2d..5519c44 100755
--- a/scripts/birdnet_analysis.sh
+++ b/scripts/birdnet_analysis.sh
@@ -318,13 +318,16 @@ until grep 5050 <(netstat -tulpn 2>&1) &> /dev/null 2>&1;do
 done
 
 if [ $(find ${RECS_DIR} -maxdepth 1 -name '*wav' | wc -l) -gt 0 ];then
+  find $RECS_DIR -maxdepth 1 -name '*wav' -type f -size 0 -delete
   run_birdnet "${RECS_DIR}"
 fi
 
 YESTERDAY="$RECS_DIR/$(date --date="yesterday" "+%B-%Y/%d-%A")"
 TODAY="$RECS_DIR/$(date "+%B-%Y/%d-%A")"
 if [ $(find ${YESTERDAY} -name '*wav' 2>/dev/null | wc -l) -gt 0 ];then
+  find $YESTERDAY -name '*wav' -type f -size 0 -delete
   run_birdnet "${YESTERDAY}"
 elif [ $(find ${TODAY} -name '*wav' | wc -l) -gt 0 ];then
+  find $TODAY -name '*wav' -type f -size 0 -delete
   run_birdnet "${TODAY}"
 fi

From 52981d421c0d213ced898d5a29e224fb41b82412 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Thu, 5 May 2022 10:34:55 -0400
Subject: [PATCH 18/22] fixed input -- this can only support one stream at a
 time

---
 scripts/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index b73bfbe..05fb346 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -215,7 +215,7 @@ if (file_exists('./scripts/thisrun.txt')) {
       <input name="channels" type="number" min="1" max="32" step="1" value="<?php print($newconfig['CHANNELS']);?>" required/><br>
       <p>Set Channels to the number of channels supported by your sound card. 32 max.</p>
       <label for="rtsp_stream">RTSP Stream: </label>
-      <textarea name="rtsp_stream" type="url" ><?php print( str_replace(",", "\r\n", $newconfig['RTSP_STREAM']));?></textarea><br>
+      <input name="rtsp_stream" type="url" value="<?php echo $newconfig['RTSP_STREAM'];?>"</input><br>
       <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. If you have multiple streams, each URL should be on its own line.</p>
       <label for="recording_length">Recording Length: </label>
       <input name="recording_length" oninput="document.getElementsByName('extraction_length')[0].setAttribute('max', this.value);" type="number" min="3" max="60" step="1" value="<?php print($newconfig['RECORDING_LENGTH']);?>" required/><br>

From 50f0ed86162f27b6e41ba4d43a08a1c9a7978c01 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Thu, 5 May 2022 10:37:17 -0400
Subject: [PATCH 19/22] Update birdnet_recording.sh

---
 scripts/birdnet_recording.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index ccd1024..53e342a 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -7,7 +7,7 @@ source /etc/birdnet/birdnet.conf
 if [ ! -z $RTSP_STREAM ];then
   while true;do
     for i in ${RTSP_STREAM//,/ };do
-      ffmpeg -i  ${i} -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav </dev/null > /dev/null 2>&1 & sleep 1;
+      ffmpeg -i  ${i} -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
     done
   done
 else

From 90d8240259e9f4b9c4752fcf77922845084fd89c Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Thu, 5 May 2022 10:38:58 -0400
Subject: [PATCH 20/22] Update advanced.php

---
 scripts/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index 05fb346..bfcd285 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -216,7 +216,7 @@ if (file_exists('./scripts/thisrun.txt')) {
       <p>Set Channels to the number of channels supported by your sound card. 32 max.</p>
       <label for="rtsp_stream">RTSP Stream: </label>
       <input name="rtsp_stream" type="url" value="<?php echo $newconfig['RTSP_STREAM'];?>"</input><br>
-      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. If you have multiple streams, each URL should be on its own line.</p>
+      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.</p>
       <label for="recording_length">Recording Length: </label>
       <input name="recording_length" oninput="document.getElementsByName('extraction_length')[0].setAttribute('max', this.value);" type="number" min="3" max="60" step="1" value="<?php print($newconfig['RECORDING_LENGTH']);?>" required/><br>
       <p>Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.</p> 

From 9f186c74b1043aaa68fadf78b52d4cc83741fc2a Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 5 May 2022 11:17:21 -0400
Subject: [PATCH 21/22] Update birdnet_recording.sh

---
 scripts/birdnet_recording.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 53e342a..8a3063b 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -7,7 +7,7 @@ source /etc/birdnet/birdnet.conf
 if [ ! -z $RTSP_STREAM ];then
   while true;do
     for i in ${RTSP_STREAM//,/ };do
-      ffmpeg -i  ${i} -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
+      ffmpeg -i  ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
     done
   done
 else

From 2d819616045c0992de2cc8b9435317631bb6405d Mon Sep 17 00:00:00 2001
From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com>
Date: Thu, 5 May 2022 14:49:40 -0400
Subject: [PATCH 22/22] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6680ba2..e513baa 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Currently listening in these countries . . . that I know of . . .
 - Italy
 - Finland
 - Australia
+- Canada
 
 ## Features
 * 24/7 recording and BirdNET-Lite analysis