Merge branch 'v2025.xx.xx' of github.com:AllskyTeam/allsky into v2025.xx.xx

Author: Alex-developer

config_repo/Makefile

@@ -6,7 +6,7 @@ VENVDIR = ${HOMEDIR}/venv
 SCRIPTSDIR = ${HOMEDIR}/scripts
 UTILITIESDIR = ${SCRIPTSDIR}/utilities
 # TODO: get from variables.sh
-NORESTARTCODES = 100 101
+NORESTARTCODES = 100 101 102
 LIBSYSTEMDIR = /lib/systemd/system
 
 .DEFAULT_GOAL := all

scripts/installUpgradeFunctions.sh

@@ -258,6 +258,10 @@ function display_msg()
 	if [[ ! -f ${DISPLAY_MSG_LOG} ]]; then
 		mkdir -p "$( dirname "${DISPLAY_MSG_LOG}" )"
 		touch "${DISPLAY_MSG_LOG}"
+	elif [[ ! -w ${DISPLAY_MSG_LOG} ]]; then
+		# A user had a problem where the log file was owned by the web server,
+		# so make sure it's owned by the user.
+		sudo chown "${ALLSKY_OWNER}:${ALLSKY_GROUP}" "${DISPLAY_MSG_LOG}"
 	fi
 
 	# Assume if GREEN isn't defined then no colors are defined.
@@ -2005,6 +2009,7 @@ function update_allsky_common()
 		-e "s;XX_EXIT_RESET_USB_XX;${ALLSKY_EXIT_RESET_USB};" \
 		-e "s;XX_EXIT_ERROR_STOP_XX;${ALLSKY_EXIT_ERROR_STOP};" \
 		-e "s;XX_EXIT_NO_CAMERA_XX;${ALLSKY_EXIT_NO_CAMERA};" \
+		-e "s;XX_EXIT_STOP_XX;${ALLSKY_EXIT_STOP};" \
 		"${DOT_H}.repo" \
 	> "${DOT_H}"
 

src/allsky_common.cpp

@@ -752,7 +752,7 @@ void displayHelp(config cg)
 	printf(" -%-*s - 'true' enables saving of daytime images [%s].\n", n, "savedaytimeimages b", yesNo(cg.daytimeSave));
 	printf(" -%-*s - 'true' enables daytime auto-exposure [%s].\n", n, "dayautoexposure b", yesNo(cg.dayAutoExposure));
 	printf(" -%-*s - Maximum daytime auto-exposure in ms.\n", n, "daymaxexposure n");
-	printf(" -%-*s - Daytime exposure in us [%'ld].\n", n, "dayexposure n", cg.dayExposure_us);
+	printf(" -%-*s - Daytime exposure in ms [%'ld].\n", n, "dayexposure n", cg.dayExposure_us / 1000);
 	printf(" -%-*s - Daytime mean target brightness [%.2f].\n", n, "daymean", cg.myModeMeanSetting.dayMean);
 	printf(" -%-*s - Daytime mean target threshold [%.2f].\n", n, "daymeanthreshold n", cg.myModeMeanSetting.dayMean_threshold);
 	if (cg.ct == ctRPi) {
@@ -781,7 +781,7 @@ void displayHelp(config cg)
 	printf(" -%-*s - 'true' enables saving of nighttime images [%s].\n", n, "savenighttimeimages b", yesNo(cg.nighttimeSave));
 	printf(" -%-*s - 'true' enables nighttime auto-exposure [%s].\n", n, "nightautoexposure b", yesNo(cg.nightAutoExposure));
 	printf(" -%-*s - Maximum nighttime auto-exposure in ms.\n", n, "nightmaxexposure n");
-	printf(" -%-*s - Nighttime exposure in us [%'ld].\n", n, "nightexposure n", cg.nightExposure_us);
+	printf(" -%-*s - Nighttime exposure in ms [%'ld].\n", n, "nightexposure n", cg.nightExposure_us / 1000);
 	printf(" -%-*s - Nighttime mean target brightness [%.2f].\n", n, "nightmean n", cg.myModeMeanSetting.nightMean);
 	if (cg.ct == ctRPi) {
 		printf("  %-*s   NOTE: Enable nighttime auto-gain and auto-exposure for best results.\n", n, "");
@@ -880,6 +880,7 @@ void displayHelp(config cg)
 		printf("  %-*s     Bullseye:           libcamera-still\n", n, "");
 		printf("  %-*s     Bookworm and newer: rpicam-still\n", n, "");
 	}
+	printf(" -%-*s - Max images to take before exiting (0 takes all) [%d].\n", n, "maximages n", cg.maxImages);
 /* These are too advanced for anyone other than developers.
 	printf(" -%-*s - Be careful changing these values, ExposureChange (Steps) = p0 + (p1*diff) + (p2*diff)^2 [%.1f].\n", n, "mean-p0 n", cg.myModeMeanSetting.dayMean_threshold);
 	printf(" -%-*s - [%.1f].\n", n, "mean-p1 n", cg.myModeMeanSetting.mean_p1);
@@ -1002,6 +1003,9 @@ void displaySettings(config cg)
 		printf("   ZWO Exposure Type: %s\n", getZWOexposureType(cg.ZWOexposureType));
 	}
 	printf("   Preview: %s\n", yesNo(cg.preview));
+	if (cg.maxImages > 0) {
+		printf("   Maximum images to take before exiting: %d\n", cg.maxImages);
+	}
 	printf("   Focus mode: %s\n", yesNo(cg.focusMode));
 	printf("   Calculate focus metric: %s\n", yesNo(cg.determineFocus));
 	printf("   Taking Dark Frames: %s\n", yesNo(cg.takeDarkFrames));
@@ -1275,6 +1279,7 @@ bool getCommandLineArguments(config *cg, int argc, char *argv[], bool readConfig
 	{
 		char *a = argv[i];
 		if (*a == '-') a++;		// skip leading "-"
+		if (*a == '-') a++;		// skip second leading "-"
 
 		Log(4, "%s >>> Parameter [%-*s]  Value: [%s]\n", b, n, a, argv[i+1]);
 
@@ -1292,7 +1297,7 @@ bool getCommandLineArguments(config *cg, int argc, char *argv[], bool readConfig
 				return(false);
 			}
 		}
-		else if (strcmp(a, "-help") == 0)
+		else if (strcmp(a, "help") == 0)
 		{
 			cg->help = true;
 			cg->quietExit = true;	// we display the help message and quit
@@ -1337,6 +1342,10 @@ bool getCommandLineArguments(config *cg, int argc, char *argv[], bool readConfig
 		{
 			cg->preview = getBoolean(argv[++i]);
 		}
+		else if (strcmp(a, "maximages") == 0)
+		{
+			cg->maxImages = atoi(argv[++i]);
+		}
 
 		// daytime settings
 		else if (strcmp(a, "takedaytimeimages") == 0)

src/include/allsky_common.h.repo

@@ -74,6 +74,7 @@
 #define EXIT_RESET_USB				XX_EXIT_RESET_USB_XX	// Need to reset USB bus; cannot continue
 #define EXIT_ERROR_STOP				XX_EXIT_ERROR_STOP_XX	// Got an unrecoverable ERROR
 #define EXIT_NO_CAMERA				XX_EXIT_NO_CAMERA_XX	// Could not find a camera - is unrecoverable
+#define EXIT_STOP					XX_EXIT_STOP_XX			// Stop services with no error
 
 enum extType {
 	isJPG,
@@ -280,6 +281,7 @@ struct config {			// for configuration variables
 	char const *ASIversion				= "UNKNOWN";		// calculated value
 	bool videoOffBetweenImages			= true;
 	ZWOexposure ZWOexposureType			= ZWOsnap;
+	int maxImages						= 0;				// Exit after this many exposure if > 0.
 
 	struct myModeMeanSetting myModeMeanSetting;
 	struct HB HB;							// Histogram Box, ZWO only

upgrade.sh

@@ -202,9 +202,9 @@ done
 
 cd || exit "${ALLSKY_EXIT_ERROR_STOP}"
 
-if [[ ! -d ${ALLSKY_CONFIG} ]]; then
+if [[ ! -d ${ALLSKY_BIN} ]]; then
 	MSG="Allsky does not appear to be installed; cannot continue."
-	MSG2="Directory '${ALLSKY_CONFIG}' does not exist."
+	MSG2="Directory '${ALLSKY_BIN}' does not exist."
 	display_msg --log error "${MSG}" "${MSG2}"
 	echo
 	exit 2
@@ -293,14 +293,10 @@ if [[ ${ACTION} == "upgrade" ]]; then
 	fi
 
 	if [[ ${CHOSEN_METHOD} == "${METHOD_IN_PLACE}" ]]; then
-		display_msg --log progress "Stopping Allsky"
-		stop_Allsky
-
 		cd "${ALLSKY_HOME}"	|| exit "${ALLSKY_EXIT_ERROR_STOP}"
 
 		display_msg --log progress "Getting new files from GitHub"
-		X="$( git pull 2>&1 )"
-		if [[ $? -ne 0 ]]; then
+		if !  X="$( git pull 2>&1 )" ; then
 			if echo "${X}" | grep -i --silent -n "would be overwritten" ; then
 				FILES="$( echo -e "${X}" | grep "^	" )"	# TAB
 				MSG="You have un-checked out files, cannot continue:\n${FILES}"
@@ -314,12 +310,14 @@ if [[ ${ACTION} == "upgrade" ]]; then
 		# If no files were retrieved, let the user know and exit.
 		if echo "${X}" | grep -i --silent "already up to date" ; then
 			echo
-			MSG="No new files, restarting Allsky and existing upgrade.\n"
+			MSG="No new files; existing upgrade.\n"
 			display_msg --log progress "" "${MSG}"
-			start_Allsky
 			exit 0
 		fi
 
+		display_msg --log progress "Stopping Allsky"
+		stop_Allsky
+
 		# Get a list of all files downloaded.  They have a " | " in their line.
 		echo "${X}" | sed --silent -e 's/^ //' -e '/ | /s/ *| *.*//p' > "${FILES_DOWNLOADED_FILE}"
 		NUM="$( wc -l < "${FILES_DOWNLOADED_FILE}" )"

variables.sh

@@ -297,6 +297,7 @@ if [[ -z "${ALLSKY_VARIABLE_SET}" || ${1} == "--force" ]]; then
 	# Anything at or above EXIT_ERROR_STOP is unrecoverable and the service must be stopped
 	ALLSKY_EXIT_ERROR_STOP=100		# unrecoverable error - need user action so stop service
 	ALLSKY_EXIT_NO_CAMERA=101		# cannot find camera
+	ALLSKY_EXIT_STOP=102			# Stop, but no error
 
 	# Name of the Pi's OS in lowercase.
 	ALLSKY_PI_OS="$( grep VERSION_CODENAME /etc/os-release )"