From 698cce0b658778cd843bab7783752d9755ac3fcb Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:46:06 +1000
Subject: [PATCH 01/16] Update config.php

Fix the request URL used to restart php once the settings have been saved
---
 scripts/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/config.php b/scripts/config.php
index f758dbd..1d782ec 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -82,7 +82,7 @@ if(isset($_GET["latitude"])){
     echo "<script>setTimeout(
     function() {
       const xhttp = new XMLHttpRequest();
-    xhttp.open(\"GET\", \"scripts/config.php?restart_php=true\", true);
+    xhttp.open(\"GET\", \"./config.php?restart_php=true\", true);
     xhttp.send();
     }, 1000);</script>";
   }

From 2efc15eb94fae2645fccd808fcf9002c653370c1 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:50:51 +1000
Subject: [PATCH 02/16] Some element tag fixes and added a link to the
 recording when on mobile

On mobile a new icon has been added to allow the user to jump to the detection's recording. Allowing the user listed to the recording as no playback controls are available when on mobile.
This is the same function available for the most recent recording
---
 scripts/todays_detections.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index d81653a..69f1e29 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -213,7 +213,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
     $_SESSION['images'] = [];
   }
   $iterations = 0;
-  $lines;
+  $lines=null;
   $licenses_urls = array();
 
   if (file_exists('./scripts/thisrun.txt')) {
@@ -324,7 +324,8 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
           </td>
         <?php } else { //legacy mode ?>
           <tr class="relative" id="<?php echo $iterations; ?>">
-          <td><?php if($_GET['kiosk'] == true) { echo relativeTime(strtotime($todaytable['Time'])); } else {echo $todaytable['Time'];}?><br></td><td id="recent_detection_middle_td">
+          <td><?php if($_GET['kiosk'] == true) { echo relativeTime(strtotime($todaytable['Time'])); } else {echo $todaytable['Time'];}?><br></td>
+          <td id="recent_detection_middle_td">
           <div>
             <div>
             <?php if(!empty($config["FLICKR_API_KEY"]) && (isset($_GET['hard_limit']) || $_GET['kiosk'] == true) && strlen($image[2]) > 0) { ?>
@@ -332,14 +333,31 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
             <?php } ?>
           </div>
             <div>
-            <b><a class="a2" <?php if($_GET['kiosk'] == false){?>href="https://allaboutbirds.org/guide/<?php echo $comname;?>"<?php } else {echo "style='color:blue;'";} ?> target="top"><?php echo $todaytable['Com_Name'];?></a></b> <img style="height: 1em;cursor:pointer;float:unset;display:inline" title="View species stats" onclick="generateMiniGraph(this, '<?php echo $comname; ?>')" width=25 src="images/chart.svg"><br>
-            <a class="a2" <?php if($_GET['kiosk'] == false){?>href="https://wikipedia.org/wiki/<?php echo $sciname;?>"<?php } else {echo "style='color:blue;'";} ?> target="top"><i><?php echo $todaytable['Sci_Name'];?></i></a><br></td>
-        </div></div>
+            <b><a class="a2" <?php if($_GET['kiosk'] == false){?>href="https://allaboutbirds.org/guide/<?php echo $comname;?>"<?php } else {echo "style='color:blue;'";} ?> target="top"><?php echo $todaytable['Com_Name'];?></a></b>
+                <?php
+                    //If on mobile, add in a icon to link off to the recording so the user can see more info
+                    if (isset($_GET['mobile'])) {
+						?>
+                            <br>
+                            <img style="height: 1em;cursor:pointer;float:unset;display:inline" title="View species stats" onclick="generateMiniGraph(this, '<?php echo $comname; ?>')" width=25 src="images/chart.svg">
+                            <a target="_blank" href="index.php?filename=<?php echo $todaytable['File_Name']; ?>"><img style="height: 1em;cursor:pointer;float:unset;display:inline" class="copyimage-mobile" title="Open in new tab" width=16 src="images/copy.png"></a>'
+						<?php
+                    }else{
+                        //Else just put the species stats icon
+                        ?>
+						    <img style="height: 1em;cursor:pointer;float:unset;display:inline" title="View species stats" onclick="generateMiniGraph(this, '<?php echo $comname; ?>')" width=25 src="images/chart.svg">
+                        <?php
+					}
+                ?>
+                <br>
+            <a class="a2" <?php if($_GET['kiosk'] == false){?>href="https://wikipedia.org/wiki/<?php echo $sciname;?>"<?php } else {echo "style='color:blue;'";} ?> target="top"><i><?php echo $todaytable['Sci_Name'];?></i></a><br>
+            </div>
+          </div>
+          </td>
           <td><b>Confidence:</b> <?php echo round((float)round($todaytable['Confidence'],2) * 100 ) . '%';?><br></td>
           <?php if(!isset($_GET['mobile'])) { ?>
-          <td style="min-width:180px"><audio controls preload="none" title="<?php echo $filename;?>"><source preload="none" src="<?php echo $filename;?>"></video>
+              <td style="min-width:180px"><audio controls preload="none" title="<?php echo $filename;?>"><source preload="none" src="<?php echo $filename;?>"></audio></td>
           <?php } ?>
-          </td>
         <?php } ?>
   <?php }?>
         </tr>

From b7928e2f410c9fc31a850108b521022fc4ec1c63 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:51:53 +1000
Subject: [PATCH 03/16] Misc element fixes - no functional changes

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

diff --git a/scripts/overview.php b/scripts/overview.php
index 8381d5a..7f41c1c 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -214,8 +214,8 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
               <?php } ?>
               <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><img style="width: unset !important;display: inline;height: 1em;cursor:pointer" title="View species stats" onclick="generateMiniGraph(this, '<?php echo $comname; ?>')" width=25 src="images/chart.svg"></br>
-                  <a href="https://wikipedia.org/wiki/<?php echo $sciname;?>" target="_blank"/><i><?php echo $mostrecent['Sci_Name'];?></i></a>
+                  <button type="submit" name="species" value="<?php echo $mostrecent['Com_Name'];?>"><?php echo $mostrecent['Com_Name'];?></button><img style="width: unset !important;display: inline;height: 1em;cursor:pointer" title="View species stats" onclick="generateMiniGraph(this, '<?php echo $comname; ?>')" width=25 src="images/chart.svg"><br>
+                  <a href="https://wikipedia.org/wiki/<?php echo $sciname;?>" target="_blank"><i><?php echo $mostrecent['Sci_Name'];?></i></a>
                   <br>Confidence: <?php echo $percent = round((float)round($mostrecent['Confidence'],2) * 100 ) . '%';?><br></div><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>

From 3cdc9634aa6e86eb4cb3147004f24ed3466cb7cb Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:55:27 +1000
Subject: [PATCH 04/16] Search Enhancement for Excluded Species List

Added basic functionality for the user to fileter/search for specie labels when looking for species to exclude. When a result is found, that option is selected and scrolled into view for the user to see.
---
 scripts/exclude_list.php | 69 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/scripts/exclude_list.php b/scripts/exclude_list.php
index 876606f..d3d496f 100644
--- a/scripts/exclude_list.php
+++ b/scripts/exclude_list.php
@@ -6,6 +6,7 @@
 <div class="customlabels column1">
 <form action="" method="GET" id="add">
   <h3>All Species Labels</h3>
+  <input autocomplete="off" size="18" type="text" placeholder="Search Species..." id="exclude_species_searchterm" name="exclude_species_searchterm">
   <select name="species[]" id="species" multiple size="auto">
   <option>Choose a species below to add to the Excluded Species List</option>
   <?php
@@ -53,5 +54,73 @@
 </div>
 </div>
 
+<script>
+    var search_term = document.querySelector("input#exclude_species_searchterm");
+    search_term.addEventListener("keydown", doSearch);
+    //Index where we found a match
+    var search_match_idx = 1;
+    var last_search_term = "";
+
+    function doSearch(eventObj) {
+        //Don't do anything if the user is till composing
+        if (eventObj.isComposing || eventObj.keyCode === 229) {
+            return;
+        }
+
+        //If the key pressed is the enter key capture it, stop the form submitting and do the search
+        if (eventObj.key === 'Enter' || eventObj.keyCode === 13) {
+            eventObj.preventDefault();
+
+            //User wants to submit the text as a search
+            var search_text = search_term.value.toLowerCase();
+
+            //Now look at the select list, loop over the options and try find part of the text in the option's name/text
+            var species_select_list = document.querySelector('select#species');
+
+            //if the search text differs from last time start the search from the begining of te list
+            if (search_text !== last_search_term) {
+                //Also unselect the last match
+                species_select_list[search_match_idx].removeAttribute('selected');
+                search_match_idx = 1;
+            }
+
+            //Start the loop at 1 so we skip the very initial value asking the user to select a option
+            for (let i = search_match_idx; i < species_select_list.length; i++) {
+                // if (species_select_list[i] !== 'undefined') {
+                option_text = species_select_list[i].value;
+                search_match_text = option_text.toLowerCase().includes(search_text)
+
+                //Check if the item is already selected, that could mean that user may be searching the same phrase
+                //again, we want to search further so let's unselect it and move to the next index
+                if (species_select_list[search_match_idx].getAttribute('selected') === true || species_select_list[search_match_idx].getAttribute('selected') === "true") {
+                    species_select_list[search_match_idx].removeAttribute('selected');
+                    //Go to the next item
+                    i++
+                    continue;
+                }
+
+                //There was a match,
+                if (search_match_text === true) {
+                    //already on this item so skip it and continue with list
+                    if (search_match_idx === i) {
+                        i++
+                        continue;
+                    }
+                    //Finally we havent found this item before
+                    search_match_idx = i;
+
+                    //Scroll into view and select it
+                    species_select_list[search_match_idx].scrollIntoView();
+                    species_select_list[search_match_idx].setAttribute('selected', true);
+                    //break the loop
+                    break;
+                }
+                // }
+            }
+            //Track what search term was used so we know when to start over
+            last_search_term = search_text
+        }
+    }
+</script>
 
 </body>

From b51b6df1afe8ecdccb3ce990acba9f6f193b4ab9 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:58:47 +1000
Subject: [PATCH 05/16] If vcgencmd is not installed don't try to execute it

More a x86 fix as this package is not installed nor will it return any useful info.
---
 scripts/extra_info.sh | 114 ++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/scripts/extra_info.sh b/scripts/extra_info.sh
index 2c3a9dc..e6a55d3 100755
--- a/scripts/extra_info.sh
+++ b/scripts/extra_info.sh
@@ -4,63 +4,67 @@
 echo "........................................IPs....................................."
 echo "LAN IP: $(hostname -I|cut -d' ' -f1)"
 echo "Public IP: $(curl -s4 ifconfig.co)"
-echo "..................................\`vcgencmd stats\`.............................."
-sudo -u$USER vcgencmd get_throttled
-hex=$(sudo -u$USER vcgencmd get_throttled|cut -d'x' -f2)
-binary=$(echo "ibase=16;obase=2;$hex"|bc)
-echo "Binary: $binary";
-revbinary=$(echo $binary|rev)
-if echo $binary | grep 1 ;then
-  echo "ISSUES DETECTED"
-  if [ ${revbinary:0:1} -eq 1 &> /dev/null ];then
-    message="Under-voltage detected"
-    echo "$message"
-    dmesg -H | grep -i voltage
-  fi
-  if [ ${revbinary:1:1} -eq 1 &> /dev/null ];then
-    message="Arm frequency capped"
-    echo "$message"
-    dmesg -H | grep -i frequen
-  fi
-  if [ ${revbinary:2:1} -eq 1 &> /dev/null ];then
-    message="Currently Throttled"
-    echo "$message"
-    dmesg -H | grep -i throttl
-  fi
-  if [ ${revbinary:3:1} -eq 1 &> /dev/null ];then
-    message="Soft temperatue limit active"
-    echo "$message"
-    dmesg -H | grep -i temperature 
-  fi
-  if [ ${revbinary:16:1} -eq 1 &> /dev/null ];then
-    message="Under-voltage has occurred"
-    echo "$message"
-    dmesg -H | grep -i voltage
-  fi
-  if [ ${revbinary:17:1} -eq 1 &> /dev/null ];then
-    message="Arm frequency capping has occurred"
-    echo "$message"
-    dmesg -H | grep -i frequen
-  fi
-  if [ ${revbinary:18:1} -eq 1 &> /dev/null ];then
-    message="Throttling has occurred"
-    echo "$message"
-    dmesg -H | grep -i throttl
-  fi
-  if [ ${revbinary:19:1} -eq 1 &> /dev/null ];then
-    message="Soft temperature limit has occurred"
-    echo "$message"
-    dmesg -H | grep -i temperature 
+if [ ! "$(dpkg -l | ! grep -q "vcgencmd")" ]
+then
+  echo "..................................\`vcgencmd stats\`.............................."
+  sudo -u$USER vcgencmd get_throttled
+  hex=$(sudo -u$USER vcgencmd get_throttled | cut -d'x' -f2)
+  binary=$(echo "ibase=16;obase=2;$hex" | bc)
+  echo "Binary: $binary"
+  revbinary=$(echo $binary | rev)
+  if echo $binary | grep 1; then
+    echo "ISSUES DETECTED"
+    if [ ${revbinary:0:1} -eq 1 ] &>/dev/null; then
+      message="Under-voltage detected"
+      echo "$message"
+      dmesg -H | grep -i voltage
+    fi
+    if [ ${revbinary:1:1} -eq 1 ] &>/dev/null; then
+      message="Arm frequency capped"
+      echo "$message"
+      dmesg -H | grep -i frequen
+    fi
+    if [ ${revbinary:2:1} -eq 1 ] &>/dev/null; then
+      message="Currently Throttled"
+      echo "$message"
+      dmesg -H | grep -i throttl
+    fi
+    if [ ${revbinary:3:1} -eq 1 ] &>/dev/null; then
+      message="Soft temperatue limit active"
+      echo "$message"
+      dmesg -H | grep -i temperature
+    fi
+    if [ ${revbinary:16:1} -eq 1 ] &>/dev/null; then
+      message="Under-voltage has occurred"
+      echo "$message"
+      dmesg -H | grep -i voltage
+    fi
+    if [ ${revbinary:17:1} -eq 1 ] &>/dev/null; then
+      message="Arm frequency capping has occurred"
+      echo "$message"
+      dmesg -H | grep -i frequen
+    fi
+    if [ ${revbinary:18:1} -eq 1 ] &>/dev/null; then
+      message="Throttling has occurred"
+      echo "$message"
+      dmesg -H | grep -i throttl
+    fi
+    if [ ${revbinary:19:1} -eq 1 ] &>/dev/null; then
+      message="Soft temperature limit has occurred"
+      echo "$message"
+      dmesg -H | grep -i temperature
+    fi
   fi
+
+  echo "....................................Clock Speeds................................"
+  for i in arm core h264 isp v3d uart pwm emmc pixel vec hdmi dpi; do
+    echo -e "${i}:\t$(sudo -u$USER vcgencmd measure_clock ${i})"
+  done
+  echo "........................................Volts..................................."
+  for i in core sdram_c sdram_i sdram_p; do
+    echo -e "${i}:\t$(sudo -u$USER vcgencmd measure_volts ${i})"
+  done
 fi
-echo "....................................Clock Speeds................................"
-for i in arm core h264 isp v3d uart pwm emmc pixel vec hdmi dpi;do
-  echo -e "${i}:\t$(sudo -u$USER vcgencmd measure_clock ${i})"
-done
-echo "........................................Volts..................................."
-for i in core sdram_c sdram_i sdram_p;do
-  echo -e "${i}:\t$(sudo -u$USER vcgencmd measure_volts ${i})"
-done
 echo ".....................................Caddyfile.................................."
 cat /etc/caddy/Caddyfile
 echo ".................................... Crontab...................................."

From ae94cbc189d5e7dd253c017c810320c031484d38 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 21:42:37 +1000
Subject: [PATCH 06/16] Enhancement to allow simultaneous RTSP stream recording

Updated birdnet_recording.sh
With a functional change around how ffmpeg is used to make use if it's functionality to accept multiple input streams and map each to a output file.
Due to the original implementation generating a  filename that contain the date/time streams would be writing to the same file - a small change was make each stream go to it's one file with unique filenames.

Updated livestream.sh & spectrogram.php
The Livestream service would fail if the RTSP stream setting was more than 1 stream (i.e comma separated list of streams)
Made some improvements so streaming is possible from any of the URL's, The Spectrogram page received a new control and some Javascript that allows the user to change between streams, the setting gets saved and the livestream service restarted so it uses's the correct stream.
This control is not visible if there are no RTSP streams configured
By default the livestream service will stream the the first RTSP URL, if the setting is not set or invalid

Updated advanced.php
With a small GUI change around RTSP steam entry by providing a input field for each URL and a button to add more fields.
In the background nothing changes as we use some Javascript to extract the valus entered and fill in the original rtsp_stream value with the correct comma separated string

Updated server.py
To work with the recording filename changes so that the correct filename is stored in the DB

Updated update_birdnet_snippets.sh
To support a new setting RTSP_STREAM_TO_LIVESTREAM on the Spectrogram page and in the livestream service
---
 homepage/style.css                 |  18 ++++-
 scripts/advanced.php               | 104 +++++++++++++++++++++++++-
 scripts/birdnet_recording.sh       |  30 +++++++-
 scripts/livestream.sh              |  19 ++++-
 scripts/server.py                  |  19 ++++-
 scripts/spectrogram.php            | 115 +++++++++++++++++++++++++++--
 scripts/update_birdnet_snippets.sh |   4 +
 7 files changed, 294 insertions(+), 15 deletions(-)

diff --git a/homepage/style.css b/homepage/style.css
index bb2ba6f..fff058a 100644
--- a/homepage/style.css
+++ b/homepage/style.css
@@ -409,8 +409,8 @@ button:hover {
 }
 
 #body::-webkit-scrollbar {
-#  display:none
-#}
+  /*display:none*/
+}
 
 @media screen and (max-width: 1290px) {
   .column1,.column2,.column3,.column4 {
@@ -563,6 +563,11 @@ button:hover {
   height:25px !important;
 }
 
+.copyimage-mobile {
+  width: 16px !important;
+  height: 16px !important;
+}
+
 .relative {
   position:relative;
 }
@@ -814,6 +819,15 @@ pre#timer.bash {
   background-color:#9fe29b
 }
 
+#newrtspstream{
+  cursor: pointer;
+  margin-left: 2px;
+  height: 5px;
+  line-height: 5px;
+  padding: 3px;
+  background-color: #9fe29b;
+}
+
 #ddnewline::before {
    content: none;
 }
\ No newline at end of file
diff --git a/scripts/advanced.php b/scripts/advanced.php
index c7081f7..5408fea 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -76,6 +76,22 @@ if(isset($_GET['submit'])) {
       exec('sudo systemctl restart livestream.service');
     }
   }
+
+  if (isset($_GET["rtsp_stream_to_livestream"])) {
+    $rtsp_stream_selected = trim($_GET["rtsp_stream_to_livestream"]);
+
+    //Setting exists already, see if the value changed
+    if (strcmp($rtsp_stream_selected, $config['RTSP_STREAM_TO_LIVESTREAM']) !== 0) {
+      $contents = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"$rtsp_stream_selected\"", $contents);
+      $contents2 = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"$rtsp_stream_selected\"", $contents2);
+      $fh = fopen("/etc/birdnet/birdnet.conf", "w");
+      $fh2 = fopen("./scripts/thisrun.txt", "w");
+      fwrite($fh, $contents);
+      fwrite($fh2, $contents2);
+      sleep(1);
+      exec("sudo systemctl restart livestream.service");
+    }
+  }
   
   if(isset($_GET["overlap"])) {
     $overlap = $_GET["overlap"];
@@ -269,6 +285,58 @@ if (file_exists('./scripts/thisrun.txt')) {
         output.innerHTML = this.value;
         document.getElementById("predictionCount").innerHTML = parseInt((this.value * <?php echo $count; ?>)/100);
       }
+
+      //Keep track of how many new input fields were added
+      var number_of_new_rtsp_urls_added = 0;
+      //Function to insert new input fields
+      function addNewrtspInput() {
+          //Find the placeholder input field
+          var url_template_element = document.getElementById('rtsp_stream_url_placeholder');
+          var new_url_input_template = url_template_element.cloneNode();
+          var br_seperator = document.createElement("BR");
+
+          //Fix up the new element so it's visible, set the style so it's sligned correctly
+          new_url_input_template.setAttribute("id", "rtsp_stream_url_new_" + number_of_new_rtsp_urls_added);
+          new_url_input_template.setAttribute("name", "rtsp_stream_new_" + number_of_new_rtsp_urls_added);
+          new_url_input_template.setAttribute("style", "margin-left: 107px");
+
+          //Insert the new input field before the button to add new urls
+          var newrtspstream_button = document.getElementById('newrtspstream_button_container');
+          //Insert the new input element before the newrtspstream button
+          newrtspstream_button.parentNode.insertBefore(new_url_input_template, newrtspstream_button);
+          //Add a separator before the button
+          newrtspstream_button.parentNode.insertBefore(br_seperator, newrtspstream_button);
+
+          //Increment the counter
+          number_of_new_rtsp_urls_added++;
+      }
+
+      var rtsp_stream_string = "";
+      var rtsp_stream_string_array = [];
+      //Collect all the rtsp urls that have been set, concat them into a single string and set it into the rtsp_stream input field so it gets saved
+      function collectrtspUrls() {
+          //Reset the array and string so we don't get duplicates
+          rtsp_stream_string = "";
+          rtsp_stream_string_array = [];
+
+          //Get the inputs by name (which is similar across
+          var existing_rtsp_stream_urls = document.querySelectorAll('[name^="rtsp_stream_"]');
+          //Loop over the result and get the values
+          for (let i = 0; i < existing_rtsp_stream_urls.length; i++) {
+              //Only collect results that re not empty and add them to the array
+              if (existing_rtsp_stream_urls[i].value !== 'undefined' && existing_rtsp_stream_urls[i].value !== "") {
+                  rtsp_stream_string_array.push(existing_rtsp_stream_urls[i].value.trim());
+              }
+          }
+
+          //if the array is not empty, then implode the array joining all the values by a comma
+          if (rtsp_stream_string_array.length !== 0) {
+              rtsp_stream_string = rtsp_stream_string_array.join(',');
+              //Locate the hidden rtsp_stream input field that we'll populate with the full string which will get saved to the config file
+              var rtsp_stream_input = document.querySelector('[name=rtsp_stream]');
+              rtsp_stream_input.setAttribute('value',rtsp_stream_string);
+          }
+      }
       </script>
       <p>If a Human is predicted anywhere among the top <span id="predictionCount"><?php echo $newconfig['PRIVACY_THRESHOLD'] == 0 ? "threshold % of" : intval(($newconfig['PRIVACY_THRESHOLD'] * $count)/100); ?></span> predictions, the sample will be considered of human origin and no data will be collected. Start with 1% and move up as needed.</p>
       <label>Full Disk Behavior: </label>
@@ -283,9 +351,37 @@ 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 echo $newconfig['RTSP_STREAM'];?>"</input><br>
-      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.</p>
+      <label id="rtsp_stream_input_label" for="rtsp_stream">RTSP Stream: </label>
+      <input style="display: none;" name="rtsp_stream" type="url" value="">
+      <input style="display: none;" id="rtsp_stream_url_placeholder" name="rtsp_stream_placeholder" type="url" size="60" value="">
+        <?php
+        //Print out the rtsp urls in their own input fields
+		//Explode the stream into an array at the comma
+		$rtsp_streams = explode(",", $newconfig['RTSP_STREAM']);
+		//Print out existing streams
+		foreach ($rtsp_streams as $stream_idx => $stream_url) {
+            //For the first input keep the element mostly the same as the original but without styling to align it
+			if ($stream_idx === 0) {
+				?>
+                <input id="rtsp_stream_url_0" name="rtsp_stream_0" type="url" size="60" value="<?php echo $stream_url; ?>">
+                <br>
+				<?php
+			} else {
+                //For every other input field, change the id to reflect the URL's index in the array
+				?>
+                <input id="rtsp_stream_url_<?php echo $stream_idx; ?>" name="rtsp_stream_<?php echo $stream_idx; ?>" type="url" size="60"
+                       value="<?php echo $stream_url; ?>"
+                       style="margin-left: 107px">
+                <br>
+				<?php
+			}
+		}
+        ?>
+      <div id="newrtspstream_button_container">
+        <br>
+        <span id="newrtspstream" style="margin-left: 107px" onclick="addNewrtspInput();">add</span><br>
+      </div>
+      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. Multiple streams are allowed but may have a impact on rPi performance. Analyze ffmpeg CPU/Memory usage with <b>top</b> or <b>htop</b> if necessary.</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> 
@@ -389,7 +485,7 @@ foreach($formats as $format){
       </p>
       <br><br>
       <input type="hidden" name="view" value="Advanced">
-      <button onclick="if(<?php print($newconfig['PRIVACY_THRESHOLD']);?> != document.getElementById('privacy_threshold').value){return confirm('This will take about 90 seconds.')}" type="submit" name="submit" value="advanced">
+      <button onclick="if(<?php print($newconfig['PRIVACY_THRESHOLD']);?> != document.getElementById('privacy_threshold').value){return confirm('This will take about 90 seconds.')} collectrtspUrls();" type="submit" name="submit" value="advanced">
 <?php
 if(isset($_GET['submit'])){
   echo "Success!";
diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 8e60dbc..d9e81f6 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Performs the recording from the specified RSTP stream or soundcard
 set -x
 source /etc/birdnet/birdnet.conf
 
@@ -6,10 +7,35 @@ source /etc/birdnet/birdnet.conf
 
 if [ ! -z $RTSP_STREAM ];then
   [ -d $RECS_DIR/StreamData ] || mkdir -p $RECS_DIR/StreamData
+  # Explode the RSPT steam setting into an array so we can count the number we have
+  RSTP_STREAMS_EXPLODED_ARRAY=(${RTSP_STREAM//,/ })
+
   while true;do
-    for i in ${RTSP_STREAM//,/ };do
-      ffmpeg -nostdin -i  ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
+# Original loop
+#    for i in ${RTSP_STREAM//,/ };do
+#      ffmpeg -nostdin -i  ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
+#    done
+
+    # Initially start the count off at 1 - our very first stream
+    RSTP_STREAMS_STARTED_COUNT=1
+    FFMPEG_PARAMS=""
+
+    # Loop over the streams
+    for i in "${RSTP_STREAMS_EXPLODED_ARRAY[@]}"
+    do
+      # Map id used to map input to output, this is 0 based in ffmpeg decrement
+      MAP_ID=$((RSTP_STREAMS_STARTED_COUNT-1))
+      # Build up the parameters to process the RSTP stream, including mapping for the output
+      FFMPEG_PARAMS+="-vn -thread_queue_size 512 -i ${i} -map ${MAP_ID} -t ${RECORDING_LENGTH} -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-RSTP_${RSTP_STREAMS_STARTED_COUNT}-$(date "+%H:%M:%S").wav "
+      # Increment counter
+      ((RSTP_STREAMS_STARTED_COUNT += 1))
     done
+
+  # Make sure were passing something valid to ffmpeg, ffmpeg will run interactive and control our look by waiting ${RECORDING_LENGTH} between loops
+  if [ -n "$FFMPEG_PARAMS" ];then
+    ffmpeg -nostdin $FFMPEG_PARAMS
+  fi
+
   done
 else
   if ! pulseaudio --check;then pulseaudio --start;fi
diff --git a/scripts/livestream.sh b/scripts/livestream.sh
index 3896ea5..6b0ba7e 100755
--- a/scripts/livestream.sh
+++ b/scripts/livestream.sh
@@ -5,7 +5,24 @@ source /etc/birdnet/birdnet.conf
 if [ -z ${REC_CARD} ];then
   echo "Stream not supported"
 elif [[ ! -z ${RTSP_STREAM} ]];then
-  ffmpeg -nostdin -loglevel 32 -ac ${CHANNELS} -i ${RTSP_STREAM} -acodec libmp3lame \
+  # Explode the RSPT steam setting into an array so we can count the number we have
+  RSTP_STREAMS_EXPLODED_ARRAY=(${RTSP_STREAM//,/ })
+
+  # If for some reason the RTSP_STREAM_TO_LIVESTREAM is not set, then init it to 0 to use the first stream
+  if [[ -z ${RTSP_STREAM_TO_LIVESTREAM} ]];then
+    RTSP_STREAM_TO_LIVESTREAM=0
+  fi
+
+  # Get the RSTP stream at the specified array index
+  SELECTED_RSTP_STREAM=${RSTP_STREAMS_EXPLODED_ARRAY[RTSP_STREAM_TO_LIVESTREAM]}
+
+  # If for some reason the RTSP stream url is null
+  if [[ -z ${SELECTED_RSTP_STREAM} ]];then
+    # Try select the first stream
+    SELECTED_RSTP_STREAM=${RSTP_STREAMS_EXPLODED_ARRAY[0]}
+  fi
+
+  ffmpeg -nostdin -loglevel 32 -ac ${CHANNELS} -i ${SELECTED_RSTP_STREAM} -acodec libmp3lame \
     -b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
     -f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
 else
diff --git a/scripts/server.py b/scripts/server.py
index 7e478df..fd0e690 100755
--- a/scripts/server.py
+++ b/scripts/server.py
@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 from tzlocal import get_localzone
 import datetime
@@ -403,8 +404,24 @@ def handle_client(conn, addr):
                 full_file_name = args.i
                 # print('FULL FILENAME: -' + full_file_name + '-')
                 file_name = Path(full_file_name).stem
+
+                # Get the RSTP stream identifier from the filename if it exists
+                rstp_ident_for_fn = ""
+                rstp_ident = re.search("RSTP_[0-9]+-", file_name)
+                if rstp_ident is not None:
+                    rstp_ident_for_fn = rstp_ident.group()
+
+                # Find and remove the identifier for the RSTP stream url it was from that is added when more than one
+                # RSTP stream is recorded simultaneously, in order to make the filenames unique as filenames are all
+                # generated at the same time
+                file_name = re.sub("RSTP_[0-9]+-", "", file_name)
+
+                # Now we can read the date and time as normal
+                # First portion of the filename contaning the date in Y m d
                 file_date = file_name.split('-birdnet-')[0]
+                # Second portion of the filename containing the time in H:M:S
                 file_time = file_name.split('-birdnet-')[1]
+                # Join the date and time together to get a complete string representing when the audio was recorded
                 date_time_str = file_date + ' ' + file_time
                 date_time_obj = datetime.datetime.strptime(date_time_str, '%Y-%m-%d %H:%M:%S')
                 # print('Date:', date_time_obj.date())
@@ -463,7 +480,7 @@ def handle_client(conn, addr):
                                 Overlap = str(args.overlap)
                                 Com_Name = Com_Name.replace("'", "")
                                 File_Name = Com_Name.replace(" ", "_") + '-' + Confidence + '-' + \
-                                    Date.replace("/", "-") + '-birdnet-' + Time + audiofmt
+                                    Date.replace("/", "-") + '-birdnet-' + rstp_ident_for_fn + Time + audiofmt
 
                                 # Connect to SQLite Database
                                 for attempt_number in range(3):
diff --git a/scripts/spectrogram.php b/scripts/spectrogram.php
index 5863e68..832dd4d 100644
--- a/scripts/spectrogram.php
+++ b/scripts/spectrogram.php
@@ -1,13 +1,14 @@
 <?php
 error_reporting(E_ERROR);
 ini_set('display_errors',1);
-if(isset($_GET['ajax_csv'])) {
 
 if (file_exists('./scripts/thisrun.txt')) {
-  $config = parse_ini_file('./scripts/thisrun.txt');
+	$config = parse_ini_file('./scripts/thisrun.txt');
 } elseif (file_exists('./scripts/firstrun.ini')) {
-  $config = parse_ini_file('./scripts/firstrun.ini');
+	$config = parse_ini_file('./scripts/firstrun.ini');
 }
+
+if(isset($_GET['ajax_csv'])) {
 $RECS_DIR = $config["RECS_DIR"];
 
 $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
@@ -39,6 +40,25 @@ if (($handle = fopen($RECS_DIR."/".date('F-Y')."/".date('d-l')."/".$newest_file.
 }
 die();
 }
+
+$RSTP_Stream_Config = array();
+
+//Load the birdnet config so we can read the RSTP setting
+// Valid config data
+if (is_array($config) && array_key_exists('RTSP_STREAM',$config)) {
+	if (is_null($config['RTSP_STREAM']) === false && $config['RTSP_STREAM'] !== "") {
+		$RSTP_Stream_Config_Data = explode(",", $config['RTSP_STREAM']);
+
+		//Process the stream further
+		//we need to able to ID it (just do this by position), get the hostname to show in the dropdown box
+		foreach ($RSTP_Stream_Config_Data as $stream_idx => $stream_url) {
+			//$stream_idx is the array position of the the RSP stream URL, idx of 0 is the first, 1 - second etc
+			$rstp_stream_url = parse_url($stream_url);
+			$RSTP_Stream_Config[$stream_idx] = $rstp_stream_url['host'];
+		}
+	}
+}
+
 ?>
 <script>  
 // CREDITS: https://codepen.io/jakealbaugh/pen/jvQweW
@@ -340,6 +360,46 @@ h1 {
 <img id="spectrogramimage" style="width:100%;height:100%;display:none" src="/spectrogram.png?nocache=<?php echo $time;?>">
 
 <div class="centered">
+	<?php
+	if (isset($RSTP_Stream_Config) && !empty($RSTP_Stream_Config)) {
+		?>
+        <div style="display:inline" id="rstp_streams">
+            <label>RTSP Stream: </label>
+            <select id="rtsp_stream_select" name="RTSP Streams">
+				<?php
+				//The setting representing which livestream to stream is more than the number of RTSP streams available
+				//maybe the list of streams has been modified
+                //This isn't the ideal for this, but needed a way to fix this setting without calling the advanced setting page
+				if (array_key_exists($config['RTSP_STREAM_TO_LIVESTREAM'], $RSTP_Stream_Config) === false) {
+					$contents = file_get_contents('/etc/birdnet/birdnet.conf');
+					$contents2 = file_get_contents('./scripts/thisrun.txt');
+					$contents = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"0\"", $contents);
+					$contents2 = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"0\"", $contents2);
+					$fh = fopen("/etc/birdnet/birdnet.conf", "w");
+					$fh2 = fopen("./scripts/thisrun.txt", "w");
+					fwrite($fh, $contents);
+					fwrite($fh2, $contents2);
+					exec("sudo systemctl restart livestream.service");
+				}
+
+				//Print out the dropdown list for the RTSP streams
+				foreach ($RSTP_Stream_Config as $stream_id => $stream_host) {
+					$isSelected = "";
+					//Match up the selected value saved in config so we can preselect it
+					if ($config['RTSP_STREAM_TO_LIVESTREAM'] == $stream_id) {
+						$isSelected = 'selected="selected"';
+					}
+					//Create the select option
+					echo "<option value=" . $stream_id . " $isSelected >" . $stream_host . "</option>";
+				}
+
+				?>
+            </select>
+        </div>
+        &mdash;
+		<?php
+	}
+	?>
   <div style="display:inline" id="gain" >
   <label>Gain: </label>
   <span class="slidecontainer">
@@ -347,7 +407,7 @@ h1 {
     <span id="gain_value"></span>%
   </span>
   </div>
-  —
+    &mdash;
   <div style="display:inline" id="comp" >
   <label>Compression: </label>
     <input name="compression" type="checkbox" id="compression" disabled>
@@ -355,10 +415,55 @@ h1 {
 </div>
 
 <audio style="display:none" controls="" crossorigin="anonymous" id='player' preload="none"><source id="playersrc" src="/stream"></audio>
-<h1>Loading...</h1>
+<h1 id="loading-h1">Loading...</h1>
 <canvas></canvas>
 
 <script>
+var rtsp_stream_select = document.getElementById("rtsp_stream_select");
+//When the dropdown selection is changed set the new value is settings, then restart the livestream service so it broadcasts newly selected RSTP stream
+rtsp_stream_select.onchange = function() {
+    if (this.value !== 'undefined'){
+        // Get the audio player element
+        var audio_player = document.querySelector('audio#player');
+        var central_controls_element = document.getElementsByClassName('centered')[0];
+
+        //Create the loading header again as a placeholder while we're waiting to reload the stream
+        var h1_loading = document.createElement("H1");
+        var h1_loading_text = document.createTextNode("Loading...");
+        h1_loading.setAttribute("id","loading-h1");
+        h1_loading.setAttribute("style","font-size:48px; font-weight: bolder; color: #FFF");
+        h1_loading.appendChild(h1_loading_text);
+
+        // Create the XMLHttpRequest object.
+        const xhr = new XMLHttpRequest();
+        // Initialize the request
+        xhr.open("GET", './views.php?rtsp_stream_to_livestream='+ this.value +'&view=Advanced&submit=advanced');
+        // Send the request
+        xhr.send();
+        // Fired once the request completes successfully
+        xhr.onload = function(e) {
+            // Check if the request was a success
+            if (this.readyState === XMLHttpRequest.DONE && this.status === 200) {
+                // Restart the audio player in case it stopped working while the livestream service was restarted
+               if(audio_player !== 'undefined'){
+                   central_controls_element.appendChild(h1_loading);
+                   //Wait 5 seconds before restarting the stream
+                   setTimeout(function () {
+                           audio_player.pause();
+                           audio_player.setAttribute('src', '/stream');
+                           audio_player.load();
+                           audio_player.play();
+
+                           document.getElementById('loading-h1').remove()
+                       },
+                       10000
+                   )
+               }
+            }
+        }
+    }
+}
+
 var slider = document.getElementById("gain_input");
 var output = document.getElementById("gain_value");
 output.innerHTML = slider.value; // Display the default slider value
diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index 813bf4d..dce9e8d 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -188,6 +188,10 @@ if ! grep APPRISE_ONLY_NOTIFY_SPECIES_NAMES /etc/birdnet/birdnet.conf &>/dev/nul
   sudo -u$USER echo "APPRISE_ONLY_NOTIFY_SPECIES_NAMES=\"\"" >> /etc/birdnet/birdnet.conf
 fi
 
+if ! grep RTSP_STREAM_TO_LIVESTREAM /etc/birdnet/birdnet.conf &>/dev/null;then
+  sudo -u$USER echo "RTSP_STREAM_TO_LIVESTREAM=\"0\"" >> /etc/birdnet/birdnet.conf
+fi
+
 
 sudo systemctl daemon-reload
 restart_services.sh

From cded6dd0311d4b1958d9bc3bc2c01635f7cabdd5 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sat, 1 Apr 2023 22:46:05 +1000
Subject: [PATCH 07/16] Update spelling for the RTSP acronym

---
 scripts/birdnet_recording.sh | 12 ++++++------
 scripts/server.py            | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index d9e81f6..dfdcefc 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -8,7 +8,7 @@ source /etc/birdnet/birdnet.conf
 if [ ! -z $RTSP_STREAM ];then
   [ -d $RECS_DIR/StreamData ] || mkdir -p $RECS_DIR/StreamData
   # Explode the RSPT steam setting into an array so we can count the number we have
-  RSTP_STREAMS_EXPLODED_ARRAY=(${RTSP_STREAM//,/ })
+  RTSP_STREAMS_EXPLODED_ARRAY=(${RTSP_STREAM//,/ })
 
   while true;do
 # Original loop
@@ -17,18 +17,18 @@ if [ ! -z $RTSP_STREAM ];then
 #    done
 
     # Initially start the count off at 1 - our very first stream
-    RSTP_STREAMS_STARTED_COUNT=1
+    RTSP_STREAMS_STARTED_COUNT=1
     FFMPEG_PARAMS=""
 
     # Loop over the streams
-    for i in "${RSTP_STREAMS_EXPLODED_ARRAY[@]}"
+    for i in "${RTSP_STREAMS_EXPLODED_ARRAY[@]}"
     do
       # Map id used to map input to output, this is 0 based in ffmpeg decrement
-      MAP_ID=$((RSTP_STREAMS_STARTED_COUNT-1))
+      MAP_ID=$((RTSP_STREAMS_STARTED_COUNT-1))
       # Build up the parameters to process the RSTP stream, including mapping for the output
-      FFMPEG_PARAMS+="-vn -thread_queue_size 512 -i ${i} -map ${MAP_ID} -t ${RECORDING_LENGTH} -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-RSTP_${RSTP_STREAMS_STARTED_COUNT}-$(date "+%H:%M:%S").wav "
+      FFMPEG_PARAMS+="-vn -thread_queue_size 512 -i ${i} -map ${MAP_ID} -t ${RECORDING_LENGTH} -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-RTSP_${RTSP_STREAMS_STARTED_COUNT}-$(date "+%H:%M:%S").wav "
       # Increment counter
-      ((RSTP_STREAMS_STARTED_COUNT += 1))
+      ((RTSP_STREAMS_STARTED_COUNT += 1))
     done
 
   # Make sure were passing something valid to ffmpeg, ffmpeg will run interactive and control our look by waiting ${RECORDING_LENGTH} between loops
diff --git a/scripts/server.py b/scripts/server.py
index fd0e690..22df448 100755
--- a/scripts/server.py
+++ b/scripts/server.py
@@ -406,15 +406,15 @@ def handle_client(conn, addr):
                 file_name = Path(full_file_name).stem
 
                 # Get the RSTP stream identifier from the filename if it exists
-                rstp_ident_for_fn = ""
-                rstp_ident = re.search("RSTP_[0-9]+-", file_name)
-                if rstp_ident is not None:
-                    rstp_ident_for_fn = rstp_ident.group()
+                RTSP_ident_for_fn = ""
+                RTSP_ident = re.search("RTSP_[0-9]+-", file_name)
+                if RTSP_ident is not None:
+                    RTSP_ident_for_fn = RTSP_ident.group()
 
                 # Find and remove the identifier for the RSTP stream url it was from that is added when more than one
                 # RSTP stream is recorded simultaneously, in order to make the filenames unique as filenames are all
                 # generated at the same time
-                file_name = re.sub("RSTP_[0-9]+-", "", file_name)
+                file_name = re.sub("RTSP_[0-9]+-", "", file_name)
 
                 # Now we can read the date and time as normal
                 # First portion of the filename contaning the date in Y m d
@@ -480,7 +480,7 @@ def handle_client(conn, addr):
                                 Overlap = str(args.overlap)
                                 Com_Name = Com_Name.replace("'", "")
                                 File_Name = Com_Name.replace(" ", "_") + '-' + Confidence + '-' + \
-                                    Date.replace("/", "-") + '-birdnet-' + rstp_ident_for_fn + Time + audiofmt
+                                    Date.replace("/", "-") + '-birdnet-' + RTSP_ident_for_fn + Time + audiofmt
 
                                 # Connect to SQLite Database
                                 for attempt_number in range(3):

From e695852d197d8a7953cbaebc3385ea5629041695 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sun, 2 Apr 2023 00:27:08 +1000
Subject: [PATCH 08/16] Make PHP use the systems timezone setting

The timezone in the PHP INI file could differ from the timezone set on the system itself and result incorrect time display on webpages and wherever date functions are used.

Simple fix to read the systems timezone and make PHP use the correct one.
---
 homepage/index.php | 20 ++++++++++++++++++++
 homepage/views.php | 22 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/homepage/index.php b/homepage/index.php
index 63e86e9..7d05830 100644
--- a/homepage/index.php
+++ b/homepage/index.php
@@ -1,4 +1,24 @@
 <?php
+$sys_timezone = "";
+// If we can get the timezome from the systems timezone file ust that
+if (file_exists('/etc/timezone')) {
+	$tz_data = file_get_contents('/etc/timezone');
+	if ($tz_data !== false) {
+		$sys_timezone = trim($tz_data);
+	}
+} else {
+// Else get timezone from the timedatectl command
+	$tz_data = shell_exec('timedatectl show');
+	$tz_data_array = parse_ini_string($tz_data);
+	if (is_array($tz_data_array) && array_key_exists('Timezone', $tz_data_array)) {
+		$sys_timezone = $tz_data_array['Timezone'];
+	}
+}
+//Finally if we have a valod timezone, set it as the one PHP uses
+if ($sys_timezone !== "") {
+	date_default_timezone_set($sys_timezone);
+}
+
   if (file_exists('./scripts/thisrun.txt')) {
     $config = parse_ini_file('./scripts/thisrun.txt');
   } elseif (file_exists('./scripts/firstrun.ini')) {
diff --git a/homepage/views.php b/homepage/views.php
index 96db5f7..2416116 100644
--- a/homepage/views.php
+++ b/homepage/views.php
@@ -1,4 +1,24 @@
-<?php 
+<?php
+$sys_timezone = "";
+// If we can get the timezome from the systems timezone file ust that
+if (file_exists('/etc/timezone')) {
+	$tz_data = file_get_contents('/etc/timezone');
+	if ($tz_data !== false) {
+		$sys_timezone = trim($tz_data);
+	}
+} else {
+// Else get timezone from the timedatectl command
+	$tz_data = shell_exec('timedatectl show');
+	$tz_data_array = parse_ini_string($tz_data);
+	if (is_array($tz_data_array) && array_key_exists('Timezone', $tz_data_array)) {
+		$sys_timezone = $tz_data_array['Timezone'];
+	}
+}
+//Finally if we have a valod timezone, set it as the one PHP uses
+if ($sys_timezone !== "") {
+	date_default_timezone_set($sys_timezone);
+}
+
 session_start();
 $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
 $user = trim($user);

From 8fbc8fdb166bbfa819fa5c1414ccd5ae174d08ad Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Mon, 3 Apr 2023 20:22:30 +1000
Subject: [PATCH 09/16] Slight cosmetic change to the RTSP input boxes

Move the first input box down one line instead of being inline with the label. Makes alignment simple and work on mobile
---
 scripts/advanced.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index 5408fea..d525b7c 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -352,6 +352,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 id="rtsp_stream_input_label" for="rtsp_stream">RTSP Stream: </label>
+      <br>
       <input style="display: none;" name="rtsp_stream" type="url" value="">
       <input style="display: none;" id="rtsp_stream_url_placeholder" name="rtsp_stream_placeholder" type="url" size="60" value="">
         <?php
@@ -370,8 +371,7 @@ if (file_exists('./scripts/thisrun.txt')) {
                 //For every other input field, change the id to reflect the URL's index in the array
 				?>
                 <input id="rtsp_stream_url_<?php echo $stream_idx; ?>" name="rtsp_stream_<?php echo $stream_idx; ?>" type="url" size="60"
-                       value="<?php echo $stream_url; ?>"
-                       style="margin-left: 107px">
+                       value="<?php echo $stream_url; ?>">
                 <br>
 				<?php
 			}
@@ -379,7 +379,7 @@ if (file_exists('./scripts/thisrun.txt')) {
         ?>
       <div id="newrtspstream_button_container">
         <br>
-        <span id="newrtspstream" style="margin-left: 107px" onclick="addNewrtspInput();">add</span><br>
+        <span id="newrtspstream" onclick="addNewrtspInput();">add</span><br>
       </div>
       <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. Multiple streams are allowed but may have a impact on rPi performance. Analyze ffmpeg CPU/Memory usage with <b>top</b> or <b>htop</b> if necessary.</p>
       <label for="recording_length">Recording Length: </label>

From 8afaf66ea78cf580e6c8bf4a68473b483bc74b49 Mon Sep 17 00:00:00 2001
From: Norm Rasmussen <norman.rasmussen@me.com>
Date: Mon, 3 Apr 2023 22:04:38 -0400
Subject: [PATCH 10/16] Create try/except statement around reading the audio
 data from the recordings. See the issue linked in the PR. By clearing the
 text in analyzing_now, my system moves past the error-causing file and
 continues processing.

---
 scripts/server.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/server.py b/scripts/server.py
index 7e478df..46a069a 100755
--- a/scripts/server.py
+++ b/scripts/server.py
@@ -395,8 +395,16 @@ def handle_client(conn, addr):
 
                 birdweather_id = args.birdweather_id
 
-                # Read audio data
-                audioData = readAudioData(args.i, args.overlap)
+                # Read audio data & handle errors
+                try:
+                    audioData = readAudioData(args.i, args.overlap)
+
+                except (NameError, TypeError) as e:
+                    print(f"Error with the following info: {e}")
+                    open('~/BirdNET-Pi/analyzing_now.txt', 'w').close()
+
+                finally:
+                    pass
 
                 # Get Date/Time from filename in case Pi gets behind
                 # now = datetime.now()
@@ -560,7 +568,7 @@ def handle_client(conn, addr):
                                             post_algorithm = "\"algorithm\": " + "\"2p2\"" + ","
                                         else:
                                             post_algorithm = "\"algorithm\": " + "\"alpha\"" + ","
-                                            
+
                                         post_confidence = "\"confidence\": " + str(entry[1])
                                         post_end = " }"
 

From 825e3926faf7100d37d76891c6436ddbbc863b1a Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:26:31 -0400
Subject: [PATCH 11/16] Lloyd's suggestions

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
---
 scripts/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index d525b7c..fddf99f 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -381,7 +381,7 @@ if (file_exists('./scripts/thisrun.txt')) {
         <br>
         <span id="newrtspstream" onclick="addNewrtspInput();">add</span><br>
       </div>
-      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. Multiple streams are allowed but may have a impact on rPi performance. Analyze ffmpeg CPU/Memory usage with <b>top</b> or <b>htop</b> if necessary.</p>
+      <p>If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.<br>Multiple streams are allowed but may have a impact on rPi performance.<br>Analyze ffmpeg CPU/Memory usage with <b>top</b> or <b>htop</b> if necessary.<br>To remove all and use the soundcard again, just delete the RTSP entries and click Save at the bottom.</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 c05ce2685db043fafb8e8d6a74e7eb53326a9b31 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:35:29 -0400
Subject: [PATCH 12/16] fix git diff --stat

previously it would show changes between the current HEAD and the previous HEAD, which would neglect to show all the file changes from multiple commits, only the most recent one. this makes sure we store the HEAD hash from before the system is updated, and then compared to HEAD after it's updated.

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
---
 scripts/update_birdnet.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/update_birdnet.sh b/scripts/update_birdnet.sh
index 1410f5a..5d8ad68 100755
--- a/scripts/update_birdnet.sh
+++ b/scripts/update_birdnet.sh
@@ -41,6 +41,9 @@ sudo_with_user () {
   set +x
 }
 
+# Get current HEAD hash
+commit_hash=$(git -C $HOME/BirdNET-Pi rev-parse HEAD)
+
 # Reset current HEAD to remove any local changes
 sudo_with_user git -C $HOME/BirdNET-Pi reset --hard
 
@@ -51,7 +54,7 @@ sudo_with_user git -C $HOME/BirdNET-Pi fetch $remote $branch
 sudo_with_user git -C $HOME/BirdNET-Pi switch -C $branch --track $remote/$branch
 
 # Prints out changes
-sudo_with_user git -C $HOME/BirdNET-Pi diff --stat HEAD^ HEAD
+sudo_with_user git -C $HOME/BirdNET-Pi diff --stat $commit_hash HEAD
 
 sudo systemctl daemon-reload
 sudo ln -sf $my_dir/* /usr/local/bin/

From 32539a65a640356395f841e360e49e55df00a25b Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:35:29 -0400
Subject: [PATCH 13/16] fix git diff --stat

previously it would show changes between the current HEAD and the previous HEAD, which would neglect to show all the file changes from multiple commits, only the most recent one. this makes sure we store the HEAD hash from before the system is updated, and then compared to HEAD after it's updated.

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
---
 scripts/update_birdnet.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/update_birdnet.sh b/scripts/update_birdnet.sh
index 1410f5a..6795df3 100755
--- a/scripts/update_birdnet.sh
+++ b/scripts/update_birdnet.sh
@@ -41,6 +41,9 @@ sudo_with_user () {
   set +x
 }
 
+# Get current HEAD hash
+commit_hash=$(sudo_with_user git -C $HOME/BirdNET-Pi rev-parse HEAD)
+
 # Reset current HEAD to remove any local changes
 sudo_with_user git -C $HOME/BirdNET-Pi reset --hard
 
@@ -51,7 +54,7 @@ sudo_with_user git -C $HOME/BirdNET-Pi fetch $remote $branch
 sudo_with_user git -C $HOME/BirdNET-Pi switch -C $branch --track $remote/$branch
 
 # Prints out changes
-sudo_with_user git -C $HOME/BirdNET-Pi diff --stat HEAD^ HEAD
+sudo_with_user git -C $HOME/BirdNET-Pi diff --stat $commit_hash HEAD
 
 sudo systemctl daemon-reload
 sudo ln -sf $my_dir/* /usr/local/bin/

From 815e7447554fafa892f08c679e1dea0cae2fd216 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 6 Apr 2023 14:46:55 -0400
Subject: [PATCH 14/16] nocache for this update

---
 homepage/index.php | 2 +-
 homepage/views.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homepage/index.php b/homepage/index.php
index 63e86e9..a30c30e 100644
--- a/homepage/index.php
+++ b/homepage/index.php
@@ -17,7 +17,7 @@ body::-webkit-scrollbar {
   display:none
 }
 </style>
-<link rel="stylesheet" href="style.css?v=1.20.23">
+<link rel="stylesheet" href="style.css?v=4.06.23">
 <link rel="stylesheet" type="text/css" href="static/dialog-polyfill.css" />
 <body>
 <div class="banner">
diff --git a/homepage/views.php b/homepage/views.php
index 96db5f7..0212ba3 100644
--- a/homepage/views.php
+++ b/homepage/views.php
@@ -31,7 +31,7 @@ if (file_exists('./scripts/thisrun.txt')) {
   $config = parse_ini_file('./scripts/firstrun.ini');
 }
 ?>
-<link rel="stylesheet" href="style.css?v=1.20.23">
+<link rel="stylesheet" href="style.css?v=4.06.23">
 <style>
 body::-webkit-scrollbar {
   display:none

From bb1ac2dd7026f225260851d0d4d56354fcd6772a Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Fri, 7 Apr 2023 08:59:58 +1000
Subject: [PATCH 15/16] Fix alignment of new RTSP stream URL input field

Remove style that was indenting the input field, this isn't needed anymore since we aren't trying to align with the label
---
 scripts/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index fddf99f..a0ddf28 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -298,7 +298,7 @@ if (file_exists('./scripts/thisrun.txt')) {
           //Fix up the new element so it's visible, set the style so it's sligned correctly
           new_url_input_template.setAttribute("id", "rtsp_stream_url_new_" + number_of_new_rtsp_urls_added);
           new_url_input_template.setAttribute("name", "rtsp_stream_new_" + number_of_new_rtsp_urls_added);
-          new_url_input_template.setAttribute("style", "margin-left: 107px");
+          new_url_input_template.removeAttribute("style");
 
           //Insert the new input field before the button to add new urls
           var newrtspstream_button = document.getElementById('newrtspstream_button_container');

From 8b33cee93dc5e92a5b856298f48120677a2a4c89 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Fri, 7 Apr 2023 09:46:31 +1000
Subject: [PATCH 16/16] Enhancement - Update Spectrogram page to show detection
 labels on RTSP streams

Added in logic to handle finding the correct 'newest' detection's CSV file for the stream being listened to, the script will look in the sound card recordings location as usual, if it finds nothing there, then look in the StreamData folder for files matching the currently listened stream

Updated spectrogram.sh to not execute sox if the file mentioned in analyzing now does not exist, this is just to try reduce noise in the logs

Fixed my mis-spelling of RTSP again

Small tweak to the Javascript responsible for drawing the labels on the spectrogram to accommodate the inclusion of RTSP_X in the streams filename
---
 scripts/spectrogram.php | 95 +++++++++++++++++++++++++++++++++--------
 scripts/spectrogram.sh  |  6 ++-
 2 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/scripts/spectrogram.php b/scripts/spectrogram.php
index 832dd4d..65acd29 100644
--- a/scripts/spectrogram.php
+++ b/scripts/spectrogram.php
@@ -14,18 +14,65 @@ $RECS_DIR = $config["RECS_DIR"];
 $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
 $home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
 $home = trim($home);
-$files = scandir($RECS_DIR."/".date('F-Y')."/".date('d-l')."/", SCANDIR_SORT_ASCENDING);
+
+//Replace variables to Fix up the file paths just in case the ENV environment variables don't resolve via PHP
+$RECS_DIR = str_replace("\$HOME", $home, $RECS_DIR);
+$STREAM_DATA_DIR = $RECS_DIR . "/StreamData/";
+
+//Try find the latest file out of the soundcard recording folder
+$look_in_directory = $RECS_DIR."/".date('F-Y')."/".date('d-l')."/";
+$files = scandir($look_in_directory, SCANDIR_SORT_ASCENDING);
+//Extract the filename, positions 0 and 1 are the folder hierarchy '.' and '..'
 $newest_file = $files[2];
 
+//Couldn't find under e.g /home/pi/April-2023/03-Monday/ (where USB audio streams are recorded
+//look in the StreamData directory (RTSP streams are recorded here)
+	if (empty($files) || array_key_exists(2, $files) === false) {
+		$look_in_directory = $STREAM_DATA_DIR;
 
+		//Load the file in the directory
+		$files = scandir($look_in_directory, SCANDIR_SORT_ASCENDING);
+
+		//Because there might be more than 1 stream, we can't really assume the file at index 2 is the latest, or even for the stream being listened to
+		//Read the RTSP_STREAM_TO_LIVESTREAM setting, then try to find that CSV file
+        if(!empty($config['RTSP_STREAM_TO_LIVESTREAM']) && is_numeric($config['RTSP_STREAM_TO_LIVESTREAM'])){
+            //The stored setting of RTSP_STREAM_TO_LIVESTREAM is 0 based, but filenames are 1's based, so just add 1 to the config value
+            //so we can match up the stream the user is listening to with the appropriate filename
+			$RTSP_STREAM_LISTENED_TO = ($config['RTSP_STREAM_TO_LIVESTREAM'] + 1);
+        }else{
+            //Setting is invalid somehow
+			//The stored setting of RTSP_STREAM_TO_LIVESTREAM is 0 based, but filenames are 1's based, so just add 1 to the config value
+			//This will be the first stream
+			$RTSP_STREAM_LISTENED_TO = 1;
+        }
+
+		//The RTSP streams contain 'RTSP_X' in the filename, were X is the stream url index in the comma separated list of RTSP streams
+		//We can use this to locate the file for this stream
+		foreach ($files as $file_idx => $stream_file_name) {
+			//Skip the folder hierarchy entries
+			if ($stream_file_name != "." && $stream_file_name != "..") {
+				//See if the filename contains the correct RTSP name, also only check .wav files by excluding the csv files with the filter .wav.csv
+				if (stripos($stream_file_name, 'RTSP_' . $RTSP_STREAM_LISTENED_TO) !== false && stripos($stream_file_name, '.wav.csv') === false) {
+					//Found a match - set it as the newest file
+					$newest_file = $stream_file_name;
+				}
+			}
+		}
+	}
+
+
+//If the newest file param has been supplied and it's the same as the newest file found
+//then stop processing
 if($newest_file == $_GET['newest_file']) {
   die();
 } 
 
+//Print out the filename
 echo "file,".$newest_file."\n";
 
+//Print out the detected birds as CSV
 $row = 1;
-if (($handle = fopen($RECS_DIR."/".date('F-Y')."/".date('d-l')."/".$newest_file.".csv", "r")) !== FALSE) {
+if (($handle = fopen($look_in_directory . $newest_file . ".csv", "r")) !== FALSE) {
     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
         if($row != 1){
           $num = count($data);
@@ -38,23 +85,25 @@ if (($handle = fopen($RECS_DIR."/".date('F-Y')."/".date('d-l')."/".$newest_file.
     }
     fclose($handle);
 }
+//Kill the script so no further processing or output is done
 die();
 }
 
-$RSTP_Stream_Config = array();
+//Hold the array of RTSP steams once they are exploded
+$RTSP_Stream_Config = array();
 
-//Load the birdnet config so we can read the RSTP setting
+//Load the birdnet config so we can read the RTSP setting
 // Valid config data
 if (is_array($config) && array_key_exists('RTSP_STREAM',$config)) {
 	if (is_null($config['RTSP_STREAM']) === false && $config['RTSP_STREAM'] !== "") {
-		$RSTP_Stream_Config_Data = explode(",", $config['RTSP_STREAM']);
+		$RTSP_Stream_Config_Data = explode(",", $config['RTSP_STREAM']);
 
 		//Process the stream further
 		//we need to able to ID it (just do this by position), get the hostname to show in the dropdown box
-		foreach ($RSTP_Stream_Config_Data as $stream_idx => $stream_url) {
+		foreach ($RTSP_Stream_Config_Data as $stream_idx => $stream_url) {
 			//$stream_idx is the array position of the the RSP stream URL, idx of 0 is the first, 1 - second etc
-			$rstp_stream_url = parse_url($stream_url);
-			$RSTP_Stream_Config[$stream_idx] = $rstp_stream_url['host'];
+			$RTSP_stream_url = parse_url($stream_url);
+			$RTSP_Stream_Config[$stream_idx] = $RTSP_stream_url['host'];
 		}
 	}
 }
@@ -159,21 +208,27 @@ function applyText(text,x,y,opacity) {
 
 var add =0;
 var newest_file;
+var newest_file_tmp;
 var lastbird;
 function loadDetectionIfNewExists() {
   const xhttp = new XMLHttpRequest();
   xhttp.onload = function() {
     // if there's a new detection that needs to be updated to the page
     if(this.responseText.length > 0 && !this.responseText.includes("Database")) {
-      
+      // Case insensitive match for RTSP_X
+      var RTSP_regex = /RTSP_[0-9]+-/i;
+      var RTSP_regex_match = false;
       var split = this.responseText.split("\n")
       for(var i = 1;i < split.length; i++) {
         if(parseInt(split[i].split(",")[0]) >= 0){
 
           newest_file =  split[0].split(",")[1]
+          newest_file_tmp = newest_file;//Copy the file name var so we something to work with
+          //Remove the string that denotes the RTSP stream from the filename to make things easier, it's not really needed
+          RTSP_regex_match = RTSP_regex.test(newest_file_tmp)
+          newest_file_tmp = newest_file_tmp.replace(RTSP_regex, "")
           //applyText(split[i].split(",")[1],document.body.querySelector('canvas').width - ((parseInt(split[i].split(",")[0]))*avgfps), (document.body.querySelector('canvas').height * 0.50))
-          
-          d1 = new Date(newest_file.split("-")[0]+"/"+newest_file.split("-")[1]+"/"+newest_file.split("-")[2]+ " "+newest_file.split("-")[4].replace(".wav",""))
+          d1 = new Date(newest_file_tmp.split("-")[0]+"/"+newest_file_tmp.split("-")[1]+"/"+newest_file_tmp.split("-")[2]+ " "+newest_file_tmp.split("-")[4].replace(".wav",""))
           console.log("d1 "+d1)
           d2 = new Date(xhttp.getResponseHeader("Date"));
           console.log("d2 "+d2)
@@ -193,7 +248,13 @@ function loadDetectionIfNewExists() {
           console.log(add)
 
           // Date csv file was created + relative detection time of bird + mic delay
-          secago = Math.abs(timeDiff) - split[i].split(",")[0] - 6.8;
+          //If we can't find the regex in the filename, then the RTSP_X string doesn't exist, unlikely to be a RTSP stream
+          if (RTSP_regex_match == false){
+            secago = (Math.abs(timeDiff) - split[i].split(",")[0]) - 6.8;
+          }else{
+            //half the delay for RTSP streams ~ just a rough guess
+            secago = (Math.abs(timeDiff) - split[i].split(",")[0]) - 4;
+          }
 
           x = document.body.querySelector('canvas').width - ((parseInt(secago))*avgfps);
           // if the text is too close to the right side of the canvas and will be cut off, wait 3 seconds before adding text
@@ -361,16 +422,16 @@ h1 {
 
 <div class="centered">
 	<?php
-	if (isset($RSTP_Stream_Config) && !empty($RSTP_Stream_Config)) {
+	if (isset($RTSP_Stream_Config) && !empty($RTSP_Stream_Config)) {
 		?>
-        <div style="display:inline" id="rstp_streams">
+        <div style="display:inline" id="RTSP_streams">
             <label>RTSP Stream: </label>
             <select id="rtsp_stream_select" name="RTSP Streams">
 				<?php
 				//The setting representing which livestream to stream is more than the number of RTSP streams available
 				//maybe the list of streams has been modified
                 //This isn't the ideal for this, but needed a way to fix this setting without calling the advanced setting page
-				if (array_key_exists($config['RTSP_STREAM_TO_LIVESTREAM'], $RSTP_Stream_Config) === false) {
+				if (array_key_exists($config['RTSP_STREAM_TO_LIVESTREAM'], $RTSP_Stream_Config) === false) {
 					$contents = file_get_contents('/etc/birdnet/birdnet.conf');
 					$contents2 = file_get_contents('./scripts/thisrun.txt');
 					$contents = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"0\"", $contents);
@@ -383,7 +444,7 @@ h1 {
 				}
 
 				//Print out the dropdown list for the RTSP streams
-				foreach ($RSTP_Stream_Config as $stream_id => $stream_host) {
+				foreach ($RTSP_Stream_Config as $stream_id => $stream_host) {
 					$isSelected = "";
 					//Match up the selected value saved in config so we can preselect it
 					if ($config['RTSP_STREAM_TO_LIVESTREAM'] == $stream_id) {
@@ -420,7 +481,7 @@ h1 {
 
 <script>
 var rtsp_stream_select = document.getElementById("rtsp_stream_select");
-//When the dropdown selection is changed set the new value is settings, then restart the livestream service so it broadcasts newly selected RSTP stream
+//When the dropdown selection is changed set the new value is settings, then restart the livestream service so it broadcasts newly selected RTSP stream
 rtsp_stream_select.onchange = function() {
     if (this.value !== 'undefined'){
         // Get the audio player element
diff --git a/scripts/spectrogram.sh b/scripts/spectrogram.sh
index 9fea456..03f299b 100755
--- a/scripts/spectrogram.sh
+++ b/scripts/spectrogram.sh
@@ -2,5 +2,7 @@
 # Make sox spectrogram
 source /etc/birdnet/birdnet.conf
 analyzing_now="$(cat $HOME/BirdNET-Pi/analyzing_now.txt)"
-spectrogram_png=${EXTRACTED}/spectrogram.png
-sox -V1 "${analyzing_now}" -n remix 1 rate 24k spectrogram -c "${analyzing_now//$HOME\/}" -o "${spectrogram_png}"
+if [ ! -z "${analyzing_now}" ] && [ -f "${analyzing_now}" ]; then
+  spectrogram_png=${EXTRACTED}/spectrogram.png
+  sox -V1 "${analyzing_now}" -n remix 1 rate 24k spectrogram -c "${analyzing_now//$HOME\/}" -o "${spectrogram_png}"
+fi