From 8961c9d45f3ae2933b0048ecea4dc3bf5a50612a Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:41:37 -0400
Subject: [PATCH 1/2] Print service status on Service Controls

---
 scripts/service_controls.php | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/scripts/service_controls.php b/scripts/service_controls.php
index 002cd4e..ad86a1e 100644
--- a/scripts/service_controls.php
+++ b/scripts/service_controls.php
@@ -1,73 +1,83 @@
+<?php 
+function service_status($name) {
+  if($name)
+  $op = shell_exec("sudo systemctl status ".$name." | grep Active | grep ' active\| activating\|running\|waiting\|start'");
+  if(strlen($op) > 0) {
+    echo "<span style='color:green'>(active)</span>";
+  } else {
+    echo "<span style='color:darkorange'>(inactive)</span>";
+  }
+}
+?>
 <html>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <br>
-<br>
 <div class="servicecontrols">
   <form action="" method="GET">
-    <h3>Live Audio Stream</h3>
+    <h3>Live Audio Stream <?php echo service_status("livestream.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop livestream.service && sudo /etc/init.d/icecast2 stop">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart livestream.service && sudo /etc/init.d/icecast2 restart">Restart </button>
     <button type="submit" name="submit" value="sudo systemctl disable --now livestream.service && sudo systemctl disable icecast2 && sudo /etc/init.d/icecast2 stop">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable icecast2 && sudo /etc/init.d/icecast2 start && sudo systemctl enable --now livestream.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Web Terminal</h3>
+    <h3>Web Terminal <?php echo service_status("web_terminal.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop web_terminal.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart web_terminal.service">Restart </button>
     <button type="submit" name="submit" value="sudo systemctl disable --now web_terminal.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now web_terminal.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>BirdNET Log</h3>
+    <h3>BirdNET Log <?php echo service_status("birdnet_log.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop birdnet_log.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart birdnet_log.service">Restart </button>
     <button type="submit" name="submit" value="sudo systemctl disable --now birdnet_log.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now birdnet_log.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Extraction Service</h3>
+    <h3>Extraction Service <?php echo service_status("extraction.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop extraction.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart extraction.service">Restart </button>
     <button type="submit" name="submit" value="sudo systemctl disable --now extraction.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now extraction.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>BirdNET Analysis Server</h3>
+    <h3>BirdNET Analysis Server <?php echo service_status("birdnet_server.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop birdnet_server.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart birdnet_server.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now birdnet_server.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now birdnet_server.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>BirdNET Analysis Client</h3>
+    <h3>BirdNET Analysis Client <?php echo service_status("birdnet_analysis.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop birdnet_analysis.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart birdnet_analysis.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now birdnet_analysis.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now birdnet_analysis.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Streamlit Statistics</h3>
+    <h3>Streamlit Statistics <?php echo service_status("birdnet_stats.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop birdnet_stats.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart birdnet_stats.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now birdnet_stats.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now birdnet_stats.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Recording Service</h3>
+    <h3>Recording Service <?php echo service_status("birdnet_recording.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop birdnet_recording.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart birdnet_recording.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now birdnet_recording.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now birdnet_recording.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Chart Viewer</h3>
+    <h3>Chart Viewer <?php echo service_status("chart_viewer.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop chart_viewer.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart chart_viewer.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now chart_viewer.service">Disable</button>
     <button type="submit" name="submit" value="sudo systemctl enable --now chart_viewer.service">Enable</button>
   </form>
   <form action="" method="GET">
-    <h3>Spectrogram Viewer</h3>
+    <h3>Spectrogram Viewer <?php echo service_status("spectrogram_viewer.service");?></h3>
     <button type="submit" name="submit" value="sudo systemctl stop spectrogram_viewer.service">Stop</button>
     <button type="submit" name="submit" value="sudo systemctl restart spectrogram_viewer.service">Restart</button>
     <button type="submit" name="submit" value="sudo systemctl disable --now spectrogram_viewer.service">Disable</button>
@@ -75,8 +85,8 @@
   </form>
   <form action="" method="GET">
     <button type="submit" name="submit" value="stop_core_services.sh">Stop Core Services</button>
-  </form>	
+  </form> 
   <form action="" method="GET">
     <button type="submit" name="submit" value="restart_services.sh">Restart Core Services</button>
-  </form>	
+  </form> 
 </div>

From eafc61f56289523a1375d3995241ce80f0c1ea37 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Thu, 21 Jul 2022 10:41:23 -0400
Subject: [PATCH 2/2] stop error message from throwing an error

---
 scripts/utils/notifications.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py
index c3ce783..17abcd3 100644
--- a/scripts/utils/notifications.py
+++ b/scripts/utils/notifications.py
@@ -59,7 +59,7 @@ def sendAppriseNotifications(species, confidence, path, date, time, week, latitu
                     image_url = 'https://farm'+str(data["farm"])+'.static.flickr.com/'+str(data["server"])+'/'+str(data["id"])+'_'+str(data["secret"])+'_n.jpg'
                     flickr_images[comName] = image_url
                 except Exception as e:
-                    print("FLICKR API ERROR: "+e)
+                    print("FLICKR API ERROR: "+str(e)) 
                     image_url = ""
             else:
                 image_url = flickr_images[comName]
