Merge branch 'mcguirepr89:main' into main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: ''
 assignees: ''
 
 ---
@@ -25,4 +25,15 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem or your installation here.
+
+**Your build**
+The hardware on which BirdNET-Pi is running goes here.
+
+**Code or log snippets**
+```
+Paste your 
+log output 
+or 
+code here
+```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

README.md

@@ -22,7 +22,6 @@ Check out birds from around the world
 - [Öringe, Tyresö, Sweden](https://tyreso.birdnetpi.com)<br>
 - [Murrysville, Pennsylvania, United States](https://murrysvillepa.birdnetpi.com)
 - [Berowra, New South Wales, Australia](https://berowra.birdnetpi.com)
-- [Fairview, Tennessee, United States](https://fairviewtennessee.birdnetpi.com)
 - [Dundas, Ontario, Canada](https://dundasontario.birdnetpi.com)
 - [Bungendore, New South Wales, Australia](https://bungendorensw.birdnetpi.com)
 - [Rivers Bend, Ohio, United States](https://riversbendoh.birdnetpi.com)

scripts/advanced.php

@@ -251,7 +251,7 @@ if (file_exists('./scripts/thisrun.txt')) {
       <p>When the disk becomes full, you can choose to 'purge' old files to make room for new ones or 'keep' your data and stop all services instead.<br>Note: you can exclude specific files from 'purge' on the Recordings page.</p>
       <label for="rec_card">Audio Card: </label>
       <input name="rec_card" type="text" value="<?php print($newconfig['REC_CARD']);?>" required/><br>
-      <p>Set Audio Card to 'default' to use PulseAudio (always recommended), or an ALSA recognized sound card device from the output of `aplay -L`.</p>
+      <p>Set Audio Card to 'default' to use PulseAudio (always recommended), or an ALSA recognized sound card device from the output of `arecord -L`. Choose the `dsnoop` device if it is available</p>
       <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>

scripts/install_services.sh

@@ -417,6 +417,15 @@ chown_things() {
   chown -R $USER:$USER $HOME/Bird*
 }
 
+increase_caddy_timeout() {
+  mkdir /etc/systemd/system/caddy.service.d
+  cat << EOF > /etc/systemd/system/caddy.service.d/override.conf
+[Service]
+TimeoutSec=300s
+EOF
+  systemctl daemon-reload
+}
+
 install_services() {
   set_hostname
   update_etc_hosts
@@ -439,6 +448,7 @@ install_services() {
   install_livestream_service
   install_cleanup_cron
   install_weekly_cron
+  increase_caddy_timeout
 
   create_necessary_dirs
   generate_BirdDB

scripts/overview.php

@@ -261,6 +261,10 @@ body::-webkit-scrollbar {
 <div class="chart">
 <?php
 $refresh = $config['RECORDING_LENGTH'];
+$dividedrefresh = $refresh/4;
+if($dividedrefresh == 0) { 
+  $dividedrefresh = 1;
+}
 $time = time();
 if (file_exists('./Charts/'.$chart)) {
   echo "<img id='chart' src=\"/Charts/$chart?nocache=$time\">";
@@ -332,7 +336,7 @@ window.setInterval(function(){
     // image or audio didn't load for some reason, force a refresh in 5 seconds
     loadDetectionIfNewExists();
   }
-}, <?php echo intval($refresh/4); ?>*1000);
+}, <?php echo intval($dividedrefresh); ?>*1000);
 
 function loadFiveMostRecentDetections() {
   const xhttp = new XMLHttpRequest();