claudecode/AvianVisitors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate code in remaining pages, setting page updates

Browse Source 
The Config and Advanced setting pages received changes to use the new setSetting() function which looks after creating or updated the setting in the required config files.
Optionally it also specification of a command to run after saving the settings.
Some variables like models, audio formats and frequency shift tools were also moved into common.php

Service Controls page received changes with the replacement of the actual command to execute with a sort of shorthand human friendly version e.g. service <action> <service_name> -- service restart livestream.service

These commands map to the original commands in serviceMaintenance() so this could be called through the API without needing the full-blown commend.
views.php was updated to accommodate this also

System Controls page received a small change to make the process checking for new git updates or getting the last commit hash a single function call.

Include and Exclude species updated to use getFilePath() to generate a path to the required file instead of the hard coded path

Views.php also received similar treatment with replacing some hard coded paths with generated paths, but logic changes to handle the change in running service commands
This commit is contained in:
jaredb7
2023-05-08 23:24:15 +10:00
parent bf0131cf27
commit ac9a0e4cbe
9 changed files with 916 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/service_controls.php
+53 -51
View File
@@ -1,17 +1,19 @@
<?php
function service_status($name) {
$user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
$home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
$home = trim($home);
<?php
if(file_exists('./scripts/common.php')){
include_once "./scripts/common.php";
}else{
include_once "./common.php";
}
function service_status($name) {
if($name == "birdnet_server.service") {
$filesinproc=trim(shell_exec("ls ".$home."/BirdSongs/Processed | wc -l"));
if($filesinproc > 200) {
$filesinproc=trim(shell_exec("ls ".getDirectory('home')."/BirdSongs/Processed | wc -l"));
if($filesinproc > 200) {
echo "<span style='color:#fc6603'>(stalled - backlog of ".$filesinproc." files in ~/BirdSongs/Processed/)</span>";
return;
}
}
$op = shell_exec("sudo systemctl status ".$name." | grep Active | grep ' active\| activating\|running\|waiting\|start'");
}
$op = getServiceStatus($name)['status'];
if(strlen($op) > 0) {
echo "<span style='color:green'>(active)</span>";
} else {
@@ -25,78 +27,78 @@ function service_status($name) {
<div class="servicecontrols">
<form action="" method="GET">
<h3>Live Audio Stream <?php echo service_status("livestream.service");?></h3>
<button type="submit" name="submit" value="sudo systemctl stop livestream.service && sudo systemctl stop icecast2.service">Stop</button>
<button type="submit" name="submit" value="sudo systemctl restart livestream.service && sudo systemctl restart icecast2.service">Restart </button>
<button type="submit" name="submit" value="sudo systemctl disable --now livestream.service && sudo systemctl disable icecast2 && sudo systemctl stop icecast2.service">Disable</button>
<button type="submit" name="submit" value="sudo systemctl enable icecast2 && sudo systemctl start icecast2.service && sudo systemctl enable --now livestream.service">Enable</button>
<button type="submit" name="submit" value="service stop livestream.service && service stop icecast2.service">Stop</button>
<button type="submit" name="submit" value="service restart livestream.service && service restart icecast2.service">Restart </button>
<button type="submit" name="submit" value="service disable livestream.service && service disable icecast2 && service stop icecast2.service">Disable</button>
<button type="submit" name="submit" value="service enable icecast2 && service start icecast2.service && service enable livestream.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop web_terminal.service">Stop</button>
<button type="submit" name="submit" value="service restart web_terminal.service">Restart </button>
<button type="submit" name="submit" value="service disable web_terminal.service">Disable</button>
<button type="submit" name="submit" value="service enable web_terminal.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop birdnet_log.service">Stop</button>
<button type="submit" name="submit" value="service restart birdnet_log.service">Restart </button>
<button type="submit" name="submit" value="service disable birdnet_log.service">Disable</button>
<button type="submit" name="submit" value="service enable birdnet_log.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop extraction.service">Stop</button>
<button type="submit" name="submit" value="service restart extraction.service">Restart </button>
<button type="submit" name="submit" value="service disable extraction.service">Disable</button>
<button type="submit" name="submit" value="service enable extraction.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop birdnet_server.service">Stop</button>
<button type="submit" name="submit" value="service restart birdnet_server.service">Restart</button>
<button type="submit" name="submit" value="service disable birdnet_server.service">Disable</button>
<button type="submit" name="submit" value="service enable birdnet_server.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop birdnet_analysis.service">Stop</button>
<button type="submit" name="submit" value="service restart birdnet_analysis.service">Restart</button>
<button type="submit" name="submit" value="service disable birdnet_analysis.service">Disable</button>
<button type="submit" name="submit" value="service enable birdnet_analysis.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop birdnet_stats.service">Stop</button>
<button type="submit" name="submit" value="service restart birdnet_stats.service">Restart</button>
<button type="submit" name="submit" value="service disable birdnet_stats.service">Disable</button>
<button type="submit" name="submit" value="service enable birdnet_stats.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop birdnet_recording.service">Stop</button>
<button type="submit" name="submit" value="service restart birdnet_recording.service">Restart</button>
<button type="submit" name="submit" value="service disable birdnet_recording.service">Disable</button>
<button type="submit" name="submit" value="service enable birdnet_recording.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="service stop chart_viewer.service">Stop</button>
<button type="submit" name="submit" value="service restart chart_viewer.service">Restart</button>
<button type="submit" name="submit" value="service disable chart_viewer.service">Disable</button>
<button type="submit" name="submit" value="service enable chart_viewer.service">Enable</button>
</form>
<form action="" method="GET">
<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>
<button type="submit" name="submit" value="sudo systemctl enable --now spectrogram_viewer.service">Enable</button>
<button type="submit" name="submit" value="service stop spectrogram_viewer.service">Stop</button>
<button type="submit" name="submit" value="service restart spectrogram_viewer.service">Restart</button>
<button type="submit" name="submit" value="service disable spectrogram_viewer.service">Disable</button>
<button type="submit" name="submit" value="service enable spectrogram_viewer.service">Enable</button>
</form>
<form action="" method="GET">
<button type="submit" name="submit" value="stop_core_services.sh">Stop Core Services</button>
<button type="submit" name="submit" value="system stop core.services">Stop Core Services</button>
</form>
<form action="" method="GET">
<button type="submit" name="submit" value="restart_services.sh">Restart Core Services</button>
<button type="submit" name="submit" value="system restart core.services">Restart Core Services</button>
</form>
</div>