fix: changing advanced settings was not updating on a fresh install ed. CHANNELS, RECORDING_LENGHT, ... simplify

scripts/advanced.php

@@ -28,6 +28,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
 if(isset($_GET['submit'])) {
   $contents = file_get_contents('/etc/birdnet/birdnet.conf');
   $contents2 = file_get_contents('./scripts/thisrun.txt');
+  $restart_livestream = False;
 
   if(isset($_GET["caddy_pwd"])) {
     $caddy_pwd = $_GET["caddy_pwd"];
@@ -70,12 +71,7 @@ if(isset($_GET['submit'])) {
     if(strcmp($rtsp_stream,$config['RTSP_STREAM']) !== 0) {
       $contents = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=\"$rtsp_stream\"", $contents);
       $contents2 = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=\"$rtsp_stream\"", $contents2);
-      $fh = fopen('/etc/birdnet/birdnet.conf', "w");
+      $restart_livestream = True;
-      $fh2 = fopen("./scripts/thisrun.txt", "w");
-      fwrite($fh, $contents);
-      fwrite($fh2, $contents2);
-      exec('sudo systemctl restart birdnet_recording.service');
-      exec('sudo systemctl restart livestream.service');
     }
   }
 
@@ -86,12 +82,7 @@ if(isset($_GET['submit'])) {
     if (strcmp($rtsp_stream_selected, $config['RTSP_STREAM_TO_LIVESTREAM']) !== 0) {
       $contents = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"$rtsp_stream_selected\"", $contents);
       $contents2 = preg_replace("/RTSP_STREAM_TO_LIVESTREAM=.*/", "RTSP_STREAM_TO_LIVESTREAM=\"$rtsp_stream_selected\"", $contents2);
-      $fh = fopen("/etc/birdnet/birdnet.conf", "w");
+      $restart_livestream = True;
-      $fh2 = fopen("./scripts/thisrun.txt", "w");
-      fwrite($fh, $contents);
-      fwrite($fh2, $contents2);
-      sleep(1);
-      exec("sudo systemctl restart livestream.service");
     }
   }
 
@@ -102,16 +93,10 @@ if(isset($_GET['submit'])) {
     if (strcmp($activate_freqshift_in_livestream, $config['ACTIVATE_FREQSHIFT_IN_LIVESTREAM']) !== 0) {
       $contents = preg_replace("/ACTIVATE_FREQSHIFT_IN_LIVESTREAM=.*/", "ACTIVATE_FREQSHIFT_IN_LIVESTREAM=\"$activate_freqshift_in_livestream\"", $contents);
       $contents2 = preg_replace("/ACTIVATE_FREQSHIFT_IN_LIVESTREAM=.*/", "ACTIVATE_FREQSHIFT_IN_LIVESTREAM=\"$activate_freqshift_in_livestream\"", $contents2);
-      $fh = fopen("/etc/birdnet/birdnet.conf", "w");
+      $restart_livestream = True;
-      $fh2 = fopen("./scripts/thisrun.txt", "w");
-      fwrite($fh, $contents);
-      fwrite($fh2, $contents2);
-      sleep(1);
-      exec("sudo systemctl restart livestream.service");
     }
   }
   
-  
   if(isset($_GET["overlap"])) {
     $overlap = $_GET["overlap"];
     if(strcmp($overlap,$config['OVERLAP']) !== 0) {
@@ -189,7 +174,6 @@ if(isset($_GET['submit'])) {
     if(strcmp($privacy_threshold,$config['PRIVACY_THRESHOLD']) !== 0) {
       $contents = preg_replace("/PRIVACY_THRESHOLD=.*/", "PRIVACY_THRESHOLD=$privacy_threshold", $contents);
       $contents2 = preg_replace("/PRIVACY_THRESHOLD=.*/", "PRIVACY_THRESHOLD=$privacy_threshold", $contents2);
-      exec('restart_services.sh');
     }
   }
 
@@ -272,95 +256,24 @@ if(isset($_GET['submit'])) {
 
   if (isset($_GET["LogLevel_BirdnetRecordingService"])) {
     $birdnet_recording_service_log_level = trim($_GET["LogLevel_BirdnetRecordingService"]);
-
-		//If setting exists change it's value
-		if (array_key_exists('LogLevel_BirdnetRecordingService', $config)) {
-			//Setting exists already, see if the value changed
 	if (strcmp($birdnet_recording_service_log_level, $config['LogLevel_BirdnetRecordingService']) !== 0) {
 		$contents = preg_replace("/LogLevel_BirdnetRecordingService=.*/", "LogLevel_BirdnetRecordingService=\"$birdnet_recording_service_log_level\"", $contents);
 		$contents2 = preg_replace("/LogLevel_BirdnetRecordingService=.*/", "LogLevel_BirdnetRecordingService=\"$birdnet_recording_service_log_level\"", $contents2);
-				$fh = fopen("/etc/birdnet/birdnet.conf", "w");
-				$fh2 = fopen("./scripts/thisrun.txt", "w");
-				fwrite($fh, $contents);
-				fwrite($fh2, $contents2);
-				sleep(1);
-				exec("sudo systemctl restart birdnet_recording.service");
-			}
-		} else {
-			//Create the setting in the setting file - same as what update_birdnet_snippets.sh does but will take the users selected log level as the value
-			shell_exec('sudo echo "LogLevel_BirdnetRecordingService=\"' . $birdnet_recording_service_log_level . '\"" >> /etc/birdnet/birdnet.conf');
-			//also update this run txt file
-			shell_exec('sudo echo "LogLevel_BirdnetRecordingService=\"' . $birdnet_recording_service_log_level . '\"" >> ./scripts/thisrun.txt');
-
-			//Reload the config files as we've changed the contents, we need to make sure the contents of the existing variables reflects contents of the config file
-			sleep(1);
-			$contents = file_get_contents('/etc/birdnet/birdnet.conf');
-			$contents2 = file_get_contents('./scripts/thisrun.txt');
-
-			exec("sudo systemctl restart birdnet_recording.service");
 	}
   }
-
   if (isset($_GET["LogLevel_SpectrogramViewerService"])) {
     $spectrogram_viewer_service_log_level = trim($_GET["LogLevel_SpectrogramViewerService"]);
-
+	if (strcmp($birdnet_recording_service_log_level, $config['LogLevel_BirdnetRecordingService']) !== 0) {
-		//If setting exists change it's value
+		$contents = preg_replace("/LogLevel_SpectrogramViewerService=.*/", "LogLevel_BirdnetRecordingService=\"$spectrogram_viewer_service_log_level\"", $contents);
-		if (array_key_exists('LogLevel_SpectrogramViewerService', $config)) {
+		$contents2 = preg_replace("/LogLevel_SpectrogramViewerService=.*/", "LogLevel_BirdnetRecordingService=\"$spectrogram_viewer_service_log_level\"", $contents2);
-			//Setting exists already, see if the value changed
-			if (strcmp($spectrogram_viewer_service_log_level, $config['LogLevel_SpectrogramViewerService']) !== 0) {
-				$contents = preg_replace("/LogLevel_SpectrogramViewerService=.*/", "LogLevel_SpectrogramViewerService=\"$spectrogram_viewer_service_log_level\"", $contents);
-				$contents2 = preg_replace("/LogLevel_SpectrogramViewerService=.*/", "LogLevel_SpectrogramViewerService=\"$spectrogram_viewer_service_log_level\"", $contents2);
-				$fh = fopen("/etc/birdnet/birdnet.conf", "w");
-				$fh2 = fopen("./scripts/thisrun.txt", "w");
-				fwrite($fh, $contents);
-				fwrite($fh2, $contents2);
-				sleep(1);
-				exec("sudo systemctl restart spectrogram_viewer.service");
-			}
-		} else {
-			//Create the setting in the setting file - same as what update_birdnet_snippets.sh does but will take the users selected log level as the value
-			shell_exec('sudo echo "LogLevel_SpectrogramViewerService=\"' . $spectrogram_viewer_service_log_level . '\"" >> /etc/birdnet/birdnet.conf');
-			//also update this run txt file
-			shell_exec('sudo echo "LogLevel_SpectrogramViewerService=\"' . $spectrogram_viewer_service_log_level . '\"" >> ./scripts/thisrun.txt');
-
-			//Reload the config files as we've changed the contents, we need to make sure the contents of the existing variables reflects contents of the config file
-			sleep(1);
-			$contents = file_get_contents('/etc/birdnet/birdnet.conf');
-			$contents2 = file_get_contents('./scripts/thisrun.txt');
-
-			exec("sudo systemctl restart spectrogram_viewer.service");
 	}
   }
-
   if (isset($_GET["LogLevel_LiveAudioStreamService"])) {
     $livestream_audio_service_log_level = trim($_GET["LogLevel_LiveAudioStreamService"]);
-
+	if (strcmp($birdnet_recording_service_log_level, $config['LogLevel_LiveAudioStreamService']) !== 0) {
-		//If setting exists change it's value
-		if (array_key_exists('LogLevel_LiveAudioStreamService', $config)) {
-			//Setting exists already, see if the value changed
-			if (strcmp($livestream_audio_service_log_level, $config['LogLevel_LiveAudioStreamService']) !== 0) {
 		$contents = preg_replace("/LogLevel_LiveAudioStreamService=.*/", "LogLevel_LiveAudioStreamService=\"$livestream_audio_service_log_level\"", $contents);
 		$contents2 = preg_replace("/LogLevel_LiveAudioStreamService=.*/", "LogLevel_LiveAudioStreamService=\"$livestream_audio_service_log_level\"", $contents2);
-				//Write the settings to the config files, so we can restart the relevant services
+		$restart_livestream = True;
-				$fh = fopen("/etc/birdnet/birdnet.conf", "w");
-				$fh2 = fopen("./scripts/thisrun.txt", "w");
-				fwrite($fh, $contents);
-				fwrite($fh2, $contents2);
-				sleep(1);
-				exec("sudo systemctl restart livestream.service && sudo systemctl restart icecast2.service");
-			}
-		} else {
-			//Create the setting in the setting file - same as what update_birdnet_snippets.sh does but will take the users selected log level as the value
-			shell_exec('sudo echo "LogLevel_LiveAudioStreamService=\"' . $livestream_audio_service_log_level . '\"" >> /etc/birdnet/birdnet.conf');
-			//also update this run txt file
-			shell_exec('sudo echo "LogLevel_LiveAudioStreamService=\"' . $livestream_audio_service_log_level . '\"" >> ./scripts/thisrun.txt');
-
-			//Reload the config files as we've changed the contents, we need to make sure the contents of the existing variables reflects contents of the config file
-			sleep(1);
-			$contents = file_get_contents('/etc/birdnet/birdnet.conf');
-			$contents2 = file_get_contents('./scripts/thisrun.txt');
-
-			exec("sudo systemctl restart livestream.service && sudo systemctl restart icecast2.service");
 	}
   }
 
@@ -370,6 +283,12 @@ if(isset($_GET['submit'])) {
   $fh2 = fopen("./scripts/thisrun.txt", "w");
   fwrite($fh, $contents);
   fwrite($fh2, $contents2);
+
+  syslog(LOG_INFO, "Restarting Services");
+  shell_exec("sudo restart_services.sh");
+  if ($restart_livestream) {
+    exec("sudo systemctl restart livestream.service");
+  }
 }
 
 $user = trim(shell_exec("awk -F: '/1000/{print $1}' /etc/passwd"));

scripts/install_config.sh

@@ -246,6 +246,9 @@ CUSTOM_IMAGE_TITLE=""
 LAST_RUN=
 THIS_RUN=
 IDFILE=$HOME/BirdNET-Pi/IdentifiedSoFar.txt
+LogLevel_BirdnetRecordingService="error"
+LogLevel_LiveAudioStreamService="error"
+LogLevel_SpectrogramViewerService="error"
 EOF
 }