From 7e4469c44e348e6c9eb74818a1e852b62a3afb4e Mon Sep 17 00:00:00 2001
From: "benjamin.baker" <benjamin.baker@geaerospace.com>
Date: Thu, 3 Sep 2026 20:26:01 -0400
Subject: [PATCH] Wire restore into the backup watcher and fix backup
 timestamps

The api queued .restore-requested but nothing consumed it, so restores silently did nothing. The watcher now services the restore sentinel by running restore.sh, and its instance_data mount is read-write so restore can lay files back down (the manual one-shot stays read-only). Backup stamps use a colon-free UTC form that Date could not parse, so the UI showed raw strings; normalize them before formatting.
---
 docker-compose.backup.yml                     |  8 +++++---
 .../src/views/settings/ShopdbBackupsList.vue  | 16 ++++++++++++---
 scripts/backup/watch.sh                       | 20 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/docker-compose.backup.yml b/docker-compose.backup.yml
index 1230b3a9..b89cec69 100644
--- a/docker-compose.backup.yml
+++ b/docker-compose.backup.yml
@@ -110,9 +110,11 @@ services:
       SHOPDB_BACKUPS_ROOT: /backups
       BACKUP_POLL_SECONDS: ${BACKUP_POLL_SECONDS:-10}
     volumes:
-      # The files half of the backup scope, read-only: we never mutate the live
-      # instance tree from the backup path.
-      - instance_data:/app/instance:ro
+      # The watcher services both backup (read) and restore (write) requests, so
+      # the instance tree is mounted read-write here. Restore has to lay the
+      # files half of a set back down next to the DB rows that reference it; the
+      # backup half still only ever reads. The manual one-shot below stays :ro.
+      - instance_data:/app/instance
       # Alembic chain, read-only, so the manifest can stamp the schema revision
       # the running code is at.
       - ./migrations:/app/migrations:ro
diff --git a/frontend/src/views/settings/ShopdbBackupsList.vue b/frontend/src/views/settings/ShopdbBackupsList.vue
index 0b649ad2..d8f541dd 100644
--- a/frontend/src/views/settings/ShopdbBackupsList.vue
+++ b/frontend/src/views/settings/ShopdbBackupsList.vue
@@ -190,7 +190,7 @@
     <div v-if="restoreTarget" class="modal-backdrop" @click.self="closeRestore">
       <div class="modal">
         <h3>Restore this backup?</h3>
-        <p class="modal-set">{{ restoreTarget.snapshotid }}</p>
+        <p class="modal-set">{{ formatTaken(restoreTarget.takenat || restoreTarget.snapshotid) }}</p>
 
         <div class="compat" :class="restoreTarget.iscompatible ? 'ok' : 'warn'">
           <component :is="restoreTarget.iscompatible ? ShieldCheck : AlertTriangle" :size="18" />
@@ -356,7 +356,7 @@ const STALE_HOURS = 48
 
 const hoursSinceLastGood = computed(() => {
   if (!lastGoodAt.value) return null
-  const then = new Date(lastGoodAt.value.replace(/Z$/, 'Z')).getTime()
+  const then = new Date(normalizeStamp(lastGoodAt.value)).getTime()
   return (Date.now() - then) / 36e5
 })
 
@@ -383,11 +383,21 @@ const bannerSub = computed(() => {
 // -- Formatting -------------------------------------------------------------
 function formatTaken(value) {
   if (!value) return 'unknown'
-  const date = new Date(value.replace(/Z$/, 'Z'))
+  const date = new Date(normalizeStamp(value))
   if (Number.isNaN(date.getTime())) return value
   return date.toLocaleString()
 }
 
+// Backup ids and manifest stamps use a filename-safe UTC form with no colons
+// (YYYY-MM-DDTHHMMSSZ, sometimes prefixed with a site name), which the Date
+// parser rejects. Reinsert the colons so it parses as real ISO 8601.
+function normalizeStamp(value) {
+  const match = String(value).match(/(\d{4}-\d{2}-\d{2})T(\d{2})(\d{2})(\d{2})Z$/)
+  if (!match) return value
+  const [, day, hour, minute, second] = match
+  return `${day}T${hour}:${minute}:${second}Z`
+}
+
 function formatSize(bytes) {
   if (!bytes) return '0 B'
   const units = ['B', 'KB', 'MB', 'GB', 'TB']
diff --git a/scripts/backup/watch.sh b/scripts/backup/watch.sh
index 42c8b93e..18c53827 100644
--- a/scripts/backup/watch.sh
+++ b/scripts/backup/watch.sh
@@ -14,12 +14,17 @@ set -uo pipefail
 
 BACKUPS_ROOT="${SHOPDB_BACKUPS_ROOT:-/backups}"
 SENTINEL="${BACKUPS_ROOT}/.backup-requested"
+RESTORE_SENTINEL="${BACKUPS_ROOT}/.restore-requested"
 INTERVAL="${BACKUP_POLL_SECONDS:-10}"
 
 log() { echo "[backup-watch] $*"; }
 
 mkdir -p "${BACKUPS_ROOT}"
-log "watcher up; polling ${SENTINEL} every ${INTERVAL}s"
+# The api container runs unprivileged and only drops sentinel files here; it
+# cannot write into a root-owned 0755 directory. Make the backups root
+# writable so "Back up now" and "Restore" can queue their sentinels.
+chmod 0777 "${BACKUPS_ROOT}" 2>/dev/null || true
+log "watcher up; polling ${SENTINEL} and ${RESTORE_SENTINEL} every ${INTERVAL}s"
 
 while true; do
 	if [ -f "${SENTINEL}" ]; then
@@ -34,5 +39,18 @@ while true; do
 			rm -f "${SENTINEL}" 2>/dev/null || true
 		fi
 	fi
+	if [ -f "${RESTORE_SENTINEL}" ]; then
+		# The api drops the target set name into the restore sentinel. Read it,
+		# hand it to restore.sh, and clear the request whether it succeeds or
+		# fails so a bad set cannot pin the watcher in a tight retry loop.
+		setname="$(head -n1 "${RESTORE_SENTINEL}" 2>/dev/null | tr -d '\r\n')"
+		log "restore requested - running restore for ${setname}"
+		if /opt/backup/restore.sh "${setname}"; then
+			log "restore completed"
+		else
+			log "restore FAILED - clearing request, awaiting next"
+		fi
+		rm -f "${RESTORE_SENTINEL}" 2>/dev/null || true
+	fi
 	sleep "${INTERVAL}"
 done