From e08180ff7d9007f022891595356f19f90b9dd186 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Thu, 3 Mar 2022 14:50:37 -0500
Subject: [PATCH] tweaks and fixes

---
 homepage/index.php           | 27 +++++++++++++++------------
 scripts/install_services.sh  |  2 ++
 scripts/update_caddyfile.sh  |  7 +++++++
 templates/livestream.service | 11 -----------
 4 files changed, 24 insertions(+), 23 deletions(-)
 delete mode 100644 templates/livestream.service

diff --git a/homepage/index.php b/homepage/index.php
index 8b8b87d..caccab9 100644
--- a/homepage/index.php
+++ b/homepage/index.php
@@ -1,10 +1,10 @@
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <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>
-</div>
+  <div class="logo">
+    <a href="https://github.com/mcguirepr89/BirdNET-Pi.git" target="_blank"><img src="images/bird.png"></a>
+  </div>
 <?php
-echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">";
 if(isset($_GET['stream'])){
   if (file_exists('/home/pi/BirdNET-Pi/thisrun.txt')) {
   $config = parse_ini_file('/home/pi/BirdNET-Pi/thisrun.txt');
@@ -21,8 +21,9 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
   $submittedpwd = $_SERVER['PHP_AUTH_PW'];
   $submitteduser = $_SERVER['PHP_AUTH_USER'];
   if($submittedpwd == $caddypwd && $submitteduser == 'birdnet'){
-    echo "<audio controls autoplay><source src=\"/stream\"></audio>
-          <h1><a href=\"\">BirdNET-Pi</a></h1>";
+	  echo "
+  <audio controls autoplay><source src=\"/stream\"></audio>
+  <h1><a href=\"\">BirdNET-Pi</a></h1>";
   } else {
     header('WWW-Authenticate: Basic realm="My Realm"');
     header('HTTP/1.0 401 Unauthorized');
@@ -31,12 +32,13 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
   }
 }
 } else {
-  echo "<form action=\"\" method=\"GET\">
-          <button type=\"submit\" name=\"stream\" value=\"play\">Live Audio</button>
-        </form>";
-  echo "<h1><a href=\"\">BirdNET-Pi</a></h1>";
+  echo "
+  <form action=\"\" method=\"GET\">
+    <button type=\"submit\" name=\"stream\" value=\"play\">Live Audio</button>
+  </form>
+  <h1><a href=\"\">BirdNET-Pi</a></h1>
+</div>";
 }
-echo "</div>";
 if(isset($_GET['log'])) {
   if (file_exists('/home/pi/BirdNET-Pi/thisrun.txt')) {
     $config = parse_ini_file('/home/pi/BirdNET-Pi/thisrun.txt');
@@ -61,5 +63,6 @@ if(isset($_GET['log'])) {
 } elseif(isset($_GET['spectrogram'])){
   header("Location: /spectrogram.php");
 } else {
-  echo "<iframe src=\"/views.php\">";
+	echo "
+<iframe src=\"/views.php\">";
 }
diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 1f929f8..8e49c50 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -213,6 +213,7 @@ install_Caddyfile() {
   cat << EOF > /etc/caddy/Caddyfile
 http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   root * ${EXTRACTED}
+  file_server browse
   handle /By_Date/* {
     file_server browse
   }
@@ -239,6 +240,7 @@ EOF
     cat << EOF > /etc/caddy/Caddyfile
 http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   root * ${EXTRACTED}
+  file_server browse
   handle /By_Date/* {
     file_server browse
   }
diff --git a/scripts/update_caddyfile.sh b/scripts/update_caddyfile.sh
index f170f64..5d85787 100755
--- a/scripts/update_caddyfile.sh
+++ b/scripts/update_caddyfile.sh
@@ -13,6 +13,7 @@ HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD})
 cat << EOF > /etc/caddy/Caddyfile
 http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   root * ${EXTRACTED}
+  file_server browse
   handle /By_Date/* {
     file_server browse
   }
@@ -40,6 +41,12 @@ else
 http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
   root * ${EXTRACTED}
   file_server browse
+  handle /By_Date/* {
+    file_server browse
+  }
+  handle /Charts/* {
+    file_server browse
+  }
   reverse_proxy /stream localhost:8000
   php_fastcgi unix//run/php/php7.4-fpm.sock
 }
diff --git a/templates/livestream.service b/templates/livestream.service
deleted file mode 100644
index ee28e4a..0000000
--- a/templates/livestream.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BirdNET-Pi Live Stream
-[Service]
-Environment=XDG_RUNTIME_DIR=/run/user/1000
-Restart=always
-Type=simple
-RestartSec=3
-User=${BIRDNET_USER}
-ExecStart=ffmpeg -loglevel 52 -ac 2 -f alsa -i ${REC_CARD} -acodec libmp3lame -b:a 320k -ac 2 -content_type 'audio/mpeg' -f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
-[Install]
-WantedBy=multi-user.target