Merge pull request #4701 from AllskyTeam/v2024.12.06_04

V2024.12.06 04

Author: EricClaeys

README.md

@@ -1,6 +1,6 @@
-# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2024.12.06_03-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
+# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2024.12.06_04-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
 
-This is the source code for the Allsky Camera project described [on Instructables](http://www.instructables.com/id/Wireless-All-Sky-Camera/).
+This is the source code for the Allsky Camera project.  <!-- described [on Instructables](http://www.instructables.com/id/Wireless-All-Sky-Camera/). -->
 &nbsp;  
 <p align="center">
 <img src="https://github.com/AllskyTeam/allsky/blob/master/assets/allsky_camera.png" width="50%" title="Example of an allsky camera">
@@ -70,7 +70,7 @@ A public page is also available in order to view the current image without havin
 http://your_raspberry_IP/public.php
 ```
 
-Make sure this page is publically viewable.
+Make sure this page is publicly viewable.
 If it is behind a firewall consult the documentation for your network equipment for information on allowing inbound connections.
 
 The WebUI has a link to the Allsky Documentation which describes all the settings Allsky uses as well as troubleshooting information.

allsky.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2154		# referenced but not assigned - from convertJSON.php
 
 [[ -z ${ALLSKY_HOME} ]] && export ALLSKY_HOME="$( realpath "$( dirname "${BASH_ARGV0}" )" )"
 ME="$( basename "${BASH_ARGV0}" )"
@@ -104,10 +105,13 @@ if [[ ${NEEDS_REBOOT} == "true" ]]; then
 	doExit "${EXIT_ERROR_STOP}" "RebootNeeded" "" "The Pi needs to be rebooted."
 fi
 
+# Get all settings we're going to use.
+#shellcheck disable=SC2119
+getAllSettings --var "lastchanged cameranumber locale" || exit 1
+
 # If the "lastchanged" setting is missing, the user needs to review/change the settings.
 # This will happen after an installation or upgrade, which also sets the Allsky status.
-LAST_CHANGED="$( settings ".lastchanged" )"
-if [[ -z ${LAST_CHANGED} ]]; then
+if [[ -z ${S_lastchanged} ]]; then
 	STATUS="$( get_allsky_status )"
 	if [[ ${STATUS} == "${ALLSKY_STATUS_REBOOT_NEEDED}" ]]; then
 		# It's been rebooted and now we need to force "lastchanged" to be set.
@@ -159,7 +163,7 @@ if [[ -d ${PRIOR_ALLSKY_DIR} ]]; then
 		MSG="Reminder: your prior Allsky is still in '${PRIOR_ALLSKY_DIR}'."
 		MSG+="\nIf you are no longer using it, it can be removed to save disk space."
 		"${ALLSKY_SCRIPTS}/addMessage.sh" --id AM_RM_PRIOR --type info --msg "${MSG}" \
-			--cmd "Click here to remove."
+			--cmd "Click here to remove the directory and all its contents."
 		touch "${ALLSKY_OLD_REMINDER}"		# Sets the last time we displayed the message.
 	fi
 fi
@@ -198,15 +202,17 @@ if [[ -f ${ALLSKY_POST_INSTALL_ACTIONS} ]]; then
 		set_allsky_status "${ALLSKY_STATUS_ACTIONS_NEEDED}"
 		doExit "${EXIT_ERROR_STOP}" "no-image" "" ""
 	else
+		# First delete the initial message if there since we're posting a reminder.
+		"${ALLSKY_SCRIPTS}/addMessage.sh" --id AM_POST --delete
+
 		MSG="Reminder: Click here to see the action(s) that need to be performed."
 		PIA="${ALLSKY_POST_INSTALL_ACTIONS/${ALLSKY_HOME}/}"
-		"${ALLSKY_SCRIPTS}/addMessage.sh" --id AM_RM_POST --type warning --msg "${MSG}" --url "${PIA}" \
+		"${ALLSKY_SCRIPTS}/addMessage.sh" --id AM_RM_POST --type warning \
+			--msg "${MSG}" --url "${PIA}" \
 			--cmd "\nOnce you perform them, click here to remove this message."
 	fi
 fi
 
-USE_NOTIFICATION_IMAGES="$( settings ".notificationimages" )"		|| exit "${EXIT_ERROR_STOP}"
-
 # Get the list of connected cameras and make sure the one we want is connected.
 if [[ ${CAMERA_TYPE} == "ZWO" ]]; then
 	RPi_COMMAND_TO_USE=""
@@ -350,11 +356,8 @@ sudo chmod 775 "${ALLSKY_ABORTS_DIR}"
 
 rm -f "${ALLSKY_NOTIFICATION_LOG}"	# clear out any notificatons from prior runs.
 
-# Optionally display a notification image.
-if [[ ${USE_NOTIFICATION_IMAGES} == "true" ]]; then
-	# Can do this in the background to speed up startup.
-	"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" --expires 0 "StartingUp" 2>&1 &
-fi
+# Can do this in the background to speed up startup.
+"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" --expires 0 "StartingUp" 2>&1 &
 
 # Only pass settings that are used by the capture program.
 if ! ARGS="$( "${ALLSKY_SCRIPTS}/convertJSON.php" --capture-only )" ; then
@@ -394,14 +397,13 @@ trap "catch_signal" SIGTERM SIGINT SIGHUP
 set_allsky_status "${ALLSKY_STATUS_STARTING}"
 
 # Run the camera-specific capture program - this is the main attraction...
-CAMERA_NUMBER="$( settings ".cameranumber" )"
-CAMERA_NUMBER="${CAMERA_NUMBER:-0}"		# default
+CAMERA_NUMBER="${S_cameranumber:-0}"		# default
 "${ALLSKY_BIN}/${CAPTURE}" \
 	-debuglevel "${ALLSKY_DEBUG_LEVEL}" \
 	-cmd "${RPi_COMMAND_TO_USE}" \
 	-cameramodel "${CAMERA_MODEL}" \
 	-cameranumber "${CAMERA_NUMBER}" \
-	-locale "$( settings ".locale" )" \
+	-locale "${S_locale}" \
 	-config "${ARGS_FILE}"
 RETCODE=$?
 
@@ -420,9 +422,7 @@ if [[ ${RETCODE} -eq ${EXIT_RESTARTING} ]]; then
 	else
 		NOTIFICATION_TYPE="Restarting"
 	fi
-	if [[ ${USE_NOTIFICATION_IMAGES} == "true" ]]; then
-		"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" "${NOTIFICATION_TYPE}"
-	fi
+	"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" "${NOTIFICATION_TYPE}"
 	set_allsky_status "${ALLSKY_STATUS_RESTARTING}"
 	doExit 0 "${NOTIFICATION_TYPE}"		# use 0 so the service is restarted
 fi
@@ -436,9 +436,7 @@ if [[ ${RETCODE} -eq ${EXIT_RESET_USB} ]]; then
 	else
 		NOTIFICATION_TYPE="Restarting"
 	fi
-	if [[ ${USE_NOTIFICATION_IMAGES} == "true" ]]; then
-		"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" "${NOTIFICATION_TYPE}"
-	fi
+	"${ALLSKY_SCRIPTS}/copyNotificationImage.sh" "${NOTIFICATION_TYPE}"
 	set_allsky_status "${ALLSKY_STATUS_ERROR}"
 	doExit 0 ""		# use 0 so the service is restarted
 fi
@@ -457,11 +455,6 @@ if [[ ${RETCODE} -ge ${EXIT_ERROR_STOP} ]]; then
 fi
 
 # Some other error
-if [[ ${USE_NOTIFICATION_IMAGES} == "true" ]]; then
-	# If started by the service, it will restart us once we exit.
-	set_allsky_status "${ALLSKY_STATUS_NOT_RUNNING}"
-	doExit "${RETCODE}" "NotRunning"
-else
-	set_allsky_status "${ALLSKY_STATUS_SEE_WEBUI}"
-	doExit "${RETCODE}" ""
-fi
+# If started by the service, it will restart us once we exit.
+set_allsky_status "${ALLSKY_STATUS_NOT_RUNNING}"
+doExit "${RETCODE}" "NotRunning"

config_repo/allskyDefines.inc.repo

@@ -15,12 +15,14 @@ define('ALLSKY_OLD_REMINDER',  'XX_ALLSKY_OLD_REMINDER_XX');
 define('ALLSKY_POST_INSTALL_ACTIONS',  'XX_ALLSKY_POST_INSTALL_ACTIONS_XX');
 define('ALLSKY_ABORTS_DIR',  'XX_ALLSKY_ABORTS_DIR_XX');
 define('ALLSKY_WEBUI',  'XX_ALLSKY_WEBUI_XX');
+define('ALLSKY_SUPPORT_DIR',  'XX_ALLSKY_SUPPORT_DIR_XX');
 define('ALLSKY_WEBSITE',  'XX_ALLSKY_WEBSITE_XX');
 define('ALLSKY_WEBSITE_LOCAL_CONFIG_NAME',  'XX_ALLSKY_WEBSITE_LOCAL_CONFIG_NAME_XX');
 define('ALLSKY_WEBSITE_REMOTE_CONFIG_NAME',  'XX_ALLSKY_WEBSITE_REMOTE_CONFIG_NAME_XX');
 define('ALLSKY_WEBSITE_LOCAL_CONFIG',  'XX_ALLSKY_WEBSITE_LOCAL_CONFIG_XX');
 define('ALLSKY_WEBSITE_REMOTE_CONFIG',  'XX_ALLSKY_WEBSITE_REMOTE_CONFIG_XX');
 define('ALLSKY_OVERLAY',  'XX_ALLSKY_OVERLAY_XX');
+define('IMG_DIR',  'XX_IMG_DIR_XX');
 define('ALLSKY_ENV',  'XX_ALLSKY_ENV_XX');
 define('MY_OVERLAY_TEMPLATES',  'XX_MY_OVERLAY_TEMPLATES_XX');
 define('ALLSKY_MODULES',  'XX_ALLSKY_MODULES_XX');
@@ -30,13 +32,20 @@ define('ALLSKY_GROUP', 'XX_ALLSKY_GROUP_XX');
 define('WEBSERVER_OWNER', 'XX_WEBSERVER_OWNER_XX');
 define('WEBSERVER_GROUP', 'XX_WEBSERVER_GROUP_XX');
 define('ALLSKY_REPO',  'XX_ALLSKY_REPO_XX');
+define('GITHUB_ROOT',  'XX_GITHUB_ROOT_XX');
+define('GITHUB_ALLSKY_REPO',  'XX_GITHUB_ALLSKY_REPO_XX');
+define('GITHUB_ALLSKY_MODULES_REPO',  'XX_GITHUB_ALLSKY_MODULES_REPO_XX');
 define('ALLSKY_VERSION',  'XX_ALLSKY_VERSION_XX');
 define('ALLSKY_STATUS',   'XX_ALLSKY_STATUS_XX');
+define('ALLSKY_STATUS_INSTALLING',   'XX_ALLSKY_STATUS_INSTALLING_XX');
+define('ALLSKY_STATUS_NOT_RUNNING',   'XX_ALLSKY_STATUS_NOT_RUNNING_XX');
+define('ALLSKY_STATUS_RUNNING',   'XX_ALLSKY_STATUS_RUNNING_XX');
 define('ALLSKY_STATUS_NEEDS_REVIEW',   'XX_ALLSKY_STATUS_NEEDS_REVIEW_XX');
 define('ALLSKY_STATUS_NEEDS_CONFIGURATION',   'XX_ALLSKY_STATUS_NEEDS_CONFIGURATION_XX');
 define('RASPI_CONFIG',   'XX_RASPI_CONFIG_XX');
 define('RASPI_ADMIN_DETAILS', 'XX_RASPI_CONFIG_XX/raspap.auth');
 define('CONFIG_UPDATE_STRING', 'XX_NEED_TO_UPDATE_XX');
+define('EXIT_PARTIAL_OK', 'XX_EXIT_PARTIAL_OK_XX');
 
 // Split the placeholder so it doesn't get replaced.
 if (ALLSKY_HOME == "XX_ALLSKY_HOME" . "_XX") {

config_repo/options.json.repo

@@ -1572,7 +1572,7 @@
 "type" : "header-tab"
 },
 {
-"name" : "timelapseheader",
+"name" : "keogramheader",
 "label" : "Keogram and Startrails Settings",
 "type" : "header"
 },
@@ -1634,7 +1634,7 @@
 },
 {
 "name" : "keogramfontcolor",
-"default" : "#fff",
+"default" : "#ffffff",
 "description" : "Font color.",
 "label" : "Font Color",
 "label_prefix" : "Keograms",
@@ -2398,16 +2398,6 @@
 "carryforward" : true
 },
 {
-"name" : "notificationimages",
-"default" : true,
-"description" : "Enable to display notification images, e.g., 'Camera is off during the day'.<br>While these messages appear in the WebUI and Allsky Website, they are not saved so don't appear in timelapse, startrails, or keograms.",
-"label" : "Notification Images",
-"type" : "boolean",
-"usage" : "capture",
-"carryforward" : true,
-"action" : "reload"
-},
-{
 "name" : "webuidatafiles",
 "default" : "",
 "description" : "See the documentation for a <a allsky='true' external='true' href='/documentation/settings/allsky.html'>description of this setting</a>.",

config_repo/sudoers.repo

@@ -4,16 +4,13 @@ www-data ALL=(ALL) NOPASSWD:/sbin/ifup
 www-data ALL=(ALL) NOPASSWD:/sbin/ifdown
 www-data ALL=(ALL) NOPASSWD:/sbin/ifup
 www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wpa_supplicant/wpa_supplicant.conf
-www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli scan_results
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli scan
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli reconfigure
-www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/hostapddata /etc/hostapd/hostapd.conf
 www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd start
 www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd stop
 www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq start
 www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq stop
-www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot
 www-data ALL=(ALL) NOPASSWD:/bin/systemctl
@@ -22,7 +19,11 @@ www-data ALL=(ALL) NOPASSWD:/bin/chown
 www-data ALL=(ALL) NOPASSWD:/bin/chmod
 www-data ALL=(ALL) NOPASSWD:/bin/rm
 www-data ALL=(ALL) NOPASSWD:/bin/cp
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/hostapddata /etc/hostapd/hostapd.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_supplicant.conf
 www-data ALL=(ALL) NOPASSWD:/bin/mv
+www-data ALL=(ALL) NOPASSWD:/bin/mkdir
 www-data ALL=(ALL) NOPASSWD:/usr/bin/vcgencmd
 www-data ALL=(ALL) NOPASSWD:/usr/sbin/ifconfig
 www-data ALL=(ALL) NOPASSWD:/usr/bin/truncate

html/allsky/js/controller.js

@@ -782,11 +782,11 @@ function AppCtrl($scope, $timeout, $http, _) {
 			2: "Quiet",
 			3: "Unsettled",
 			4: "Active",
-			5: "Minor_storm",
-			6: "Moderate_storm",
-			7: "Strong_storm",
-			8: "Severe_storm",
-			9: "Extreme_storm",
+			5: "Minor_Storm",
+			6: "Moderate_Storm",
+			7: "Strong_Storm",
+			8: "Severe_Storm",
+			9: "Extreme_Storm",
 			100: "WARNING"
 		};
 		return scale[index];