Merge branch 'main' into offline-time-testy

LICENSE

@@ -918,7 +918,7 @@ Caddy, WiFi-Connect,Streamlit, and Adminer use the Apache License Version 2.0
    limitations under the License.
 
 =============================================================================
-GoTTY and autoAP scripts use the MIT License
+GoTTY and Apprise Notifications use the MIT License
 =============================================================================
 MIT License
 

README.md

@@ -53,7 +53,7 @@ Currently listening in these countries . . . that I know of . . .
 * SQLite3 Database
 * Adminer database maintenance
 * [phpSysInfo](https://github.com/phpsysinfo/phpsysinfo)
-* New species mobile notifications from [Pushed.co](https://pushed.co/quick-start-guide) (for iOS users only)
+* [Apprise Notifications](https://github.com/caronc/apprise) supporting 70+ notification platforms
 * Localization supported
 
 ## Requirements
@@ -104,7 +104,12 @@ Submit an issue or discussion.
 Please join a Discussion!! and please join [BirdWeather!!](https://app.birdweather.com)
 I hope that if you find BirdNET-Pi has been worth your time, you will share your setup, results, customizations, etc. [HERE](https://github.com/mcguirepr89/BirdNET-Pi/discussions/69) and will consider [making your installation public](https://github.com/mcguirepr89/BirdNET-Pi/wiki/Sharing-Your-BirdNET-Pi).
 
-## ToDo, Notes, and Coming Soon 
+## Project Links
+
+- [Marie Lelouche's <i>Out of Spaces</i>](https://www.lestanneries.fr/exposition/marie-lelouche-out-of-spaces/) using BirdNET-Pi in post-sculpture VR! [Press Kit](https://github.com/mcguirepr89/BirdNET-Pi-assets/blob/main/dp_out_of_spaces_marie_lelouche_digital_05_01_22.pdf)
+- [Research on noded BirdNET-Pi networks for farming](https://github.com/mcguirepr89/BirdNET-Pi-assets/blob/main/G23_Report_ModelBasedSysEngineering_FarmMarkBirdDetector_V1__Copy_.pdf)
+- <ins>[Core-Electronics](https://core-electronics.com.au/projects/bird-calls-raspberry-pi)</ins> Build Article
+
 
 ### Internationalization:
 The bird names are in English by default, but other localized versions are available thanks to the wonderful efforts of [@patlevin](https://github.com/patlevin). Use the web interface's "Tools" > "Settings" and select your "Database Language" to have the detections in your language.

scripts/advanced.php

@@ -33,8 +33,8 @@ if(isset($_GET['submit'])) {
   if(isset($_GET["caddy_pwd"])) {
     $caddy_pwd = $_GET["caddy_pwd"];
     if(strcmp($caddy_pwd,$config['CADDY_PWD']) !== 0) {
-      $contents = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=$caddy_pwd", $contents);
+      $contents = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=\"$caddy_pwd\"", $contents);
-      $contents2 = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=$caddy_pwd", $contents2);
+      $contents2 = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=\"$caddy_pwd\"", $contents2);
       $fh = fopen('/etc/birdnet/birdnet.conf', "w");
       $fh2 = fopen("./scripts/thisrun.txt", "w");
       fwrite($fh, $contents);

scripts/config.php

@@ -178,7 +178,7 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken}
         <option value="labels_th.txt">Thai</option>
         <option value="labels_uk.txt">Ukrainian</option>
       </select>
-      <br>
+      <br><br>
       <script>
         function handleChange(checkbox) {
           // this disables the input of manual date and time if the user wants to use the internet time

scripts/extract_new_birdsounds.sh

@@ -117,7 +117,7 @@ for h in "${SCAN_DIRS[@]}";do
     fi
 
     sox "${h}/${OLDFILE}" "${NEWSPECIES_BYDATE}/${NEWFILE}" \
-      trim "${START}" "${END}"
+      trim ="${START}" ="${END}"
 
     # Create spectrogram for extraction
     sox "${NEWSPECIES_BYDATE}/${NEWFILE}" -n remix 1 rate 24k spectrogram \

scripts/install_services.sh

@@ -212,7 +212,7 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   handle /Charts/* {
     file_server browse
   }
-  basicauth views.php?view=File* {
+  basicauth /views.php?view=File* {
     birdnet ${HASHWORD}
   }
   basicauth /Processed* {

scripts/update_birdnet.sh

@@ -6,6 +6,7 @@ USER=$(awk -F: '/1000/ {print $1}' /etc/passwd)
 HOME=$(awk -F: '/1000/ {print $6}' /etc/passwd)
 my_dir=$HOME/BirdNET-Pi/scripts
 
+sudo -u$USER git -C $my_dir rm privacy_server.py
 sudo -u${USER} git -C $my_dir stash
 sudo -u${USER} git -C $my_dir pull -f
 sudo systemctl daemon-reload
@@ -14,4 +15,4 @@ sudo ln -sf $my_dir/* /usr/local/bin/
 
 # The script below handles changes to the host system
 # Any additions to the updater should be placed in that file.
-sudo $my_dir/update_birdnet_snippets.sh
+sudo $my_dir/update_birdnet_snippets.sh

scripts/update_caddyfile.sh

@@ -18,7 +18,7 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   handle /Charts/* {
     file_server browse
   }
-  basicauth views.php?view=File* {
+  basicauth /views.php?view=File* {
     birdnet ${HASHWORD}
   }
   basicauth /Processed* {