testing another installation

homepage/index.php

@@ -3,7 +3,11 @@
 <link rel="stylesheet" href="style.css">
 <div class="banner">
   <div class="logo">
-    <a href="https://github.com/mcguirepr89/BirdNET-Pi.git" target="_blank"><img src="images/bird.png"></a>
+<?php if(isset($_GET['logo'])) {
+echo "<a href=\"https://github.com/mcguirepr89/BirdNET-Pi.git\" target=\"_blank\"><img style=\"width:60;height:60;\" src=\"images/bird.png\"></a>";
+} else {
+echo "<a href=\"https://github.com/mcguirepr89/BirdNET-Pi.git\" target=\"_blank\"><img src=\"images/bird.png\"></a>";
+}?>
   </div>
 <?php
 if(isset($_GET['stream'])){
@@ -61,9 +65,9 @@ if(isset($_GET['log'])) {
       $logs = "http://birdnetpi.local:8080";
     }
   }
-  header("Location: $logs");
+  header("Location: $logs?logo=smaller");
 } elseif(isset($_GET['spectrogram'])){
-  header("Location: /spectrogram.php");
+  header("Location: /spectrogram.php?logo=smaller");
 } else {
   echo "
 <iframe src=\"/views.php\">

homepage/style.css

@@ -285,6 +285,16 @@ button:hover {
   float: left;
 }
 
+.systemcontrols form {
+  text-align: center;
+}
+
+.systemcontrols button {
+  border: 2px solid black;
+  background-color: rgb(159, 226, 155);
+  width: 20%;
+}
+
 body::-webkit-scrollbar {
   display:none
 }

homepage/views.php

@@ -20,9 +20,11 @@
   <button type="submit" name="view" value="Recordings" form="views">Recordings</button>
 </form>
 <form action="index.php" method="GET" id="Log">
+  <input type="hidden" name="logo" value="smaller">
   <button type="submit" name="log" value="log" form="Log">View Log</button>
 </form>
 <form action="index.php" method="GET" id="spectrogram">
+  <input type="hidden" name="logo" value="smaller">
   <button style="float:none;" type="submit" name="spectrogram" value="view" id="spectrogram" form="spectrogram">Spectrogram</button>
 </form>
 <button href="javascript:void(0);" class="icon" onclick="myFunction()"><img src="images/menu.png"></button>
@@ -165,8 +167,21 @@ if(isset($_POST['view'])){
       }
     }
   }
-}else{
+} elseif(isset($_POST['submit'])) {
-  include('overview.php');}
+  $command = $_POST['submit'];
+  if($command == 'update_birdnet.sh'){
+    $str= "<h3>Updating . . . </h3>
+      <p>Please wait 60 seconds</p>";
+    echo str_pad($str, 4096);
+    ob_flush();
+    flush();
+  }
+  if(isset($command)){
+    $results = shell_exec("$command 2>&1");
+    echo "<pre>$results</pre>";
+  }
+  ob_end_flush();
+} else {include('overview.php');}
 ?>
 <script>
 function myFunction() {

scripts/clear_all_data.sh

@@ -9,10 +9,13 @@ USER=pi
 my_dir=${HOME}/BirdNET-Pi/scripts
 echo "Stopping services"
 sudo systemctl stop birdnet_recording.service
+sudo systemctl stop birdnet_analysis.service
+sudo systemctl stop birdnet_service.service
 echo "Removing all data . . . "
 sudo rm -drf "${RECS_DIR}"
 sudo rm -f "${IDFILE}"
 sudo rm -f $(dirname ${my_dir})/BirdDB.txt
+
 echo "Creating necessary directories"
 [ -d ${EXTRACTED} ] || sudo -u ${USER} mkdir -p ${EXTRACTED}
 [ -d ${EXTRACTED}/By_Date ] || sudo -u ${USER} mkdir -p ${EXTRACTED}/By_Date
@@ -20,66 +23,21 @@ echo "Creating necessary directories"
 [ -d ${PROCESSED} ] || sudo -u ${USER} mkdir -p ${PROCESSED}
 
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}
-if [ ! -z ${BIRDNETLOG_URL} ];then
-  BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-  sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
-  phpfiles="$(grep -l "$(hostname).local:8080" ${my_dir}/*.php)"
-  for i in "${phpfiles[@]}";do
-    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" ${i}
-  done
-fi
-if [ ! -z ${WEBTERMINAL_URL} ];then
-  WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
-  sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" $(dirname ${my_dir})/homepage/*.html
-  phpfiles="$(grep -l "$(hostname).local:8888" ${my_dir}/*.php)"
-  for i in "${phpfiles[@]}";do
-    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" ${i}
-  done
-fi
-
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/model/labels.txt ${my_dir}/
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
-if [ -z ${BIRDNETPI_URL} ];then
+sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/play.php ${EXTRACTED}
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/homepage/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.php
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*/*.php
-else
-  BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/homepage/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.php
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-fi
-
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED}
-sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewday.php ${EXTRACTED}
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED}
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/stats.php ${EXTRACTED}
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED}
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/history.php ${EXTRACTED}
-sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/play.php ${EXTRACTED}
 sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/images/favicon.ico ${EXTRACTED}
 sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED}
-sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/phpsysinfo.ini ${HOME}/phpsysinfo/
+sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/phpsysinfo.ini ${HOME}/phpsysinfo/
-sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/green_bootstrap.css ${HOME}/phpsysinfo/templates/
+sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/green_bootstrap.css ${HOME}/phpsysinfo/templates/
-sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/index_bootstrap.html ${HOME}/phpsysinfo/templates/html
+sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/index_bootstrap.html ${HOME}/phpsysinfo/templates/html
-
+sudo -u ${USER} chmod -R g+rw $(dirname ${my_dir})
-sudo chmod -R g+rw $(dirname ${my_dir})
+sudo -u ${USER} chmod -R g+rw ${RECS_DIR}
-sudo chmod -R g+rw ${RECS_DIR}
-
-echo "Generating BirdDB.txt"
-if ! [ -f $(dirname ${my_dir})/BirdDB.txt ];then
-  sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt
-  echo "Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap" | sudo -u ${USER} tee -a $(dirname ${my_dir})/BirdDB.txt
-elif ! grep Date $(dirname ${my_dir})/BirdDB.txt;then
-  sudo -u ${USER} sed -i '1 i\Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap' $(dirname ${my_dir})/BirdDB.txt
-fi
-ln -sf $(dirname ${my_dir})/BirdDB.txt ${my_dir}/BirdDB.txt &&
-sudo chown pi:pi ${my_dir}/BirdDB.txt && sudo chmod g+rw ${my_dir}/BirdDB.txt
-
 
 echo "Dropping and re-creating database"
 sudo /home/pi/BirdNET-Pi/scripts/createdb.sh

scripts/install_services.sh

@@ -118,32 +118,6 @@ create_necessary_dirs() {
   [ -d ${PROCESSED} ] || sudo -u ${USER} mkdir -p ${PROCESSED}
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}  
-  if [ ! -z ${BIRDNETLOG_URL} ];then
-    BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/homepage/*.html
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*.php
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-  fi
-  if [ ! -z ${WEBTERMINAL_URL} ];then
-    WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/homepage/*.html
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*.php
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-  fi
-
-  sudo -u ${USER} ln -fs $(dirname ${my_dir})/model/labels.txt ${my_dir}/
-  sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
-  if [ -z ${BIRDNETPI_URL} ];then
-    sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/homepage/*.html
-    sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.php
-    sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*/*.php
-  else
-    BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/homepage/*.html
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.php
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-  fi
-
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/play.php ${EXTRACTED}
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED}
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED}
@@ -155,7 +129,6 @@ create_necessary_dirs() {
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/phpsysinfo.ini ${HOME}/phpsysinfo/
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/green_bootstrap.css ${HOME}/phpsysinfo/templates/
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/index_bootstrap.html ${HOME}/phpsysinfo/templates/html
-
   chmod -R g+rw $(dirname ${my_dir})
   chmod -R g+rw ${RECS_DIR}
 }

scripts/system_controls.php

@@ -24,20 +24,20 @@ ob_end_flush();
 <html>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="../style.css">
-<style>
+<div class="systemcontrols">
-</style>
+  <form action="" method="POST">
-<form action="" method="POST" id="reboot">
+    <button type="submit" name="submit" value="sudo reboot" onclick="return confirm('Are you sure you want to reboot?')">Reboot</button>
-<input type="hidden" name="submit" value="sudo reboot" form="reboot">
+  </form>
-<button type="submit" class="block" onclick="return confirm('Are you sure you want to reboot?')" form="reboot">Reboot</button>
+  <form action="" method="POST">
-<form action="" method="POST" onclick="return confirm('BE SURE TO STASH ANY LOCAL CHANGES YOU HAVE MADE TO THE SYSTEM BEFORE UPDATING!!!')">
+    <button type="submit" name="submit" value="update" onclick="return confirm('BE SURE TO STASH ANY LOCAL CHANGES YOU HAVE MADE TO THE SYSTEM BEFORE UPDATING!!!')" >Update</button>
-<input type="hidden" name="submit" value="update_birdnet.sh">
+  </form>
-<button style="color:blue;" type="submit" class="block">Update</button>
+  <form action="" method="POST">
-</form>
+    <button type="submit" name="submit" value="sudo shutdown now" onclick="return confirm('Are you sure you want to shutdown?')">Shutdown</button>
-<form action="" method="POST" onclick="return confirm('Are you sure you want to shutdown?')">
+  </form>
-<input type="hidden" name="submit" value="sudo shutdown now">
+  <form action="" method="POST">
-<button style="color: red;" type="submit" class="block">Shutdown</button>
+    <button type="submit" name="submit" value="clear_all_data.sh" onclick="return confirm('Clear ALL Data? This cannot be undone.')">Clear ALL data</button>
-</form>
+  </form>	
-<form action="" method="POST" onclick="return confirm('Clear ALL Data? This cannot be undone.')">
+  <form action="" method="POST">
-<input type="hidden" name="submit" value="clear_all_data.sh">
+    <button type="submit" name="submit" value="">Test</button>
-<button style="color: red;" type="submit" class="block">Clear ALL data</button>
+  </form>
-</form>	
+</div>

scripts/update_caddyfile.sh

@@ -78,51 +78,5 @@ ${BIRDNETLOG_URL} {
 }
 EOF
 fi
-################################################################################
-sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f homepage/*
-sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/*
-sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/*/*
-
-if [ ! -z ${BIRDNETLOG_URL} ];then
-  BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-elif [ -z ${BIRDNETPI_URL} ];then
-  BIRDNETLOG_URL="http:\/\/$(hostname).local:8080"
-else
-  BIRDNETLOG_URL="${BIRDNETPI_URL}:8080"
-fi
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/homepage/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*.php
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-
-if [ ! -z ${WEBTERMINAL_URL} ];then
-  WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
-elif [ -z ${BIRDNETPI_URL} ];then
-  WEBTERMINAL_URL="http:\/\/$(hostname).local:8888"
-else
-  WEBTERMINAL_URL="${BIRDNETPI_URL}:8888"
-fi
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/homepage/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*.html
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*.php
-sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-
-
-if [ -z ${BIRDNETPI_URL} ];then
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/homepage/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*.php
-  sudo -u${USER} sed -i "s/birdnetpi.local/$(hostname).local/g" $(dirname ${my_dir})/scripts/*/*.php
-else
-  BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/homepage/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.html
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*.php
-  sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*/*.php
-fi
 
 sudo systemctl reload caddy