peritia/Nyx-Minecraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: add more checks to filter between different backup processes

Browse source
This commit is contained in:
Peritia 2025-12-29 11:53:45 +01:00
parent f1c94810b0
commit fa6a2d4869
1 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

43
minecraft/Scripts/minecraft-template-backup-routine.sh
View file

@ -201,37 +201,55 @@ countdown() {
} }
build_backup_signature() {
local sig=()
[[ "$FULL" == true ]] && sig+=("full") || sig+=("world")
[[ "$PURE" == true ]] && sig+=("pure")
sig+=("format=$FORMAT")
sig+=("compression=$COMPRESSION")
IFS=','; echo "${sig[*]}"
}
check_user_activity() { check_user_activity() {
local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE" local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE"
local marker="[backuped:${BACKUP_SIGNATURE}]"
if [[ ! -f "$activity_file" ]]; then if [[ ! -f "$activity_file" ]]; then
echo "[WARN] User activity file not found: $activity_file" echo "[WARN] User activity file not found: $activity_file"
return 1 return 1
fi fi
# Find unbackuped login lines # Find login lines NOT marked with the current backup signature
if ! grep -E 'was logged in' "$activity_file" | grep -vq '\[backuped\]'; then if ! grep -E 'was logged in' "$activity_file" | grep -vqF "$marker"; then
echo "[INFO] No unbackuped user activity detected." echo "[INFO] No unbackuped user activity detected for signature: $BACKUP_SIGNATURE"
return 1 return 1
fi fi
echo "[INFO] Unbackuped user activity detected." echo "[INFO] Unbackuped user activity detected for signature: $BACKUP_SIGNATURE"
return 0 return 0
} }
mark_user_activity_backuped() { mark_user_activity_backuped() {
local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE" local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE"
local marker="[backuped:${BACKUP_SIGNATURE}]"
# Append [backuped] to all unbackuped login lines [[ -z "${ACTIVITY_LINE_CUTOFF:-}" || "$ACTIVITY_LINE_CUTOFF" -le 0 ]] && return 0
# Only mark lines that existed before the backup started
sed -i \ sed -i \
-e '/was logged in/{ -e "1,${ACTIVITY_LINE_CUTOFF}{
/\[backuped\]/! s/$/ [backuped]/ /was logged in/{
}' \ /$marker/! s/\$/ $marker/
}
}" \
"$activity_file" "$activity_file"
} }
do_backup() { do_backup() {
local backup_source="" local backup_source=""
local backup_destination="" local backup_destination=""
@ -386,6 +404,15 @@ do_backup() {
#echo "[DEBUG] FULL=$FULL" #echo "[DEBUG] FULL=$FULL"
BACKUP_SIGNATURE="$(build_backup_signature)"
ACTIVITY_LINE_CUTOFF=0
if [[ "$CHECK_USER" == true ]]; then
ACTIVITY_LINE_CUTOFF=$(wc -l < "$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE")
fi
if [[ "$CHECK_USER" == true ]]; then if [[ "$CHECK_USER" == true ]]; then
echo "[INFO] Running in --check-user mode" echo "[INFO] Running in --check-user mode"
if ! check_user_activity; then if ! check_user_activity; then