From ed018c06eb2620376e5f6f0015a5428905a18e59 Mon Sep 17 00:00:00 2001 From: kzolotarev95 Date: Sun, 28 Jun 2026 17:54:58 +0400 Subject: [PATCH] Add async backup progress console --- files/www/cgi-bin/owrt-full-backup | 178 ++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 3 deletions(-) diff --git a/files/www/cgi-bin/owrt-full-backup b/files/www/cgi-bin/owrt-full-backup index b33885d..1d25846 100644 --- a/files/www/cgi-bin/owrt-full-backup +++ b/files/www/cgi-bin/owrt-full-backup @@ -6,6 +6,8 @@ PARAMS_FILE="${TMPDIR:-/tmp}/owrt-full-backup-cgi.$$" RESULT_FILE="" RESULT_TITLE="" RESULT_CODE="" +JOB_DIR="${JOB_DIR:-/tmp/owrt-full-backup-jobs}" +ACTIVE_JOB="" PROJECT_URL="${PROJECT_URL:-https://github.com/kzolotarev95/luci-app-owrt-full-backup}" RAW_URL="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-full-backup/main}" @@ -121,6 +123,21 @@ valid_abs_path() { printf '%s' "$1" | grep -Eq '^/[A-Za-z0-9._/-]+$' } +valid_job_id() { + case "$1" in + ''|*[!A-Za-z0-9._-]*) return 1 ;; + *) return 0 ;; + esac +} + +shell_quote() { + printf "'%s'" "$(printf '%s' "$1" | sed "s/'/'\\\\''/g")" +} + +job_file() { + printf '%s/%s.%s' "$JOB_DIR" "$1" "$2" +} + download_file() { local file base file="$(param file)" @@ -177,12 +194,14 @@ handle_delete_backup() { esac if [ ! -f "$file" ]; then + RESULT_TITLE="Бэкап уже удален" RESULT_CODE=0 printf 'Архив уже удален или его нет в папке: %s\n' "$file" >"$RESULT_FILE" return fi if rm -f "$file" "$file.sha256" 2>"$RESULT_FILE"; then + RESULT_TITLE="Бэкап удален" RESULT_CODE=0 printf 'Удалено: %s\n' "$file" >"$RESULT_FILE" else @@ -205,6 +224,67 @@ handle_upload_backup() { RESULT_CODE="$?" } +start_backend_job() { + local title id started log status meta script cmd arg + title="$1" + shift + + if [ ! -x "$BACKEND" ]; then + RESULT_TITLE="$title" + RESULT_CODE=127 + RESULT_FILE="${TMPDIR:-/tmp}/owrt-full-backup-result.$$" + printf 'Backend не установлен: %s\n' "$BACKEND" >"$RESULT_FILE" + return + fi + + mkdir -p "$JOB_DIR" + id="$(date +%s)-$$" + started="$(date +%s)" + log="$(job_file "$id" log)" + status="$(job_file "$id" status)" + meta="$(job_file "$id" meta)" + script="$(job_file "$id" sh)" + + ACTIVE_JOB="$id" + printf 'running\n' >"$status" + { + printf 'title=%s\n' "$title" + printf 'started=%s\n' "$started" + } >"$meta" + + cmd="$(shell_quote "$BACKEND")" + for arg in "$@"; do + cmd="$cmd $(shell_quote "$arg")" + done + + cat >"$script" < "$(job_file "$id" code)" +date +%s > "$(job_file "$id" finished)" +if [ "\$code" = "0" ]; then + echo done > "$status" +else + echo failed > "$status" +fi +rm -f "$script" +EOF + chmod 0700 "$script" + if command -v start-stop-daemon >/dev/null 2>&1 && start-stop-daemon -S -b -x /bin/sh -- "$script" >"$log" 2>&1; then + : + elif command -v setsid >/dev/null 2>&1; then + setsid sh "$script" >"$log" 2>&1 /dev/null 2>&1; then + nohup sh "$script" >"$log" 2>&1 "$log" 2>&1 /dev/null || printf 'missing')" + meta="$(job_file "$id" meta)" + log="$(job_file "$id" log)" + code_file="$(job_file "$id" code)" + started="$(sed -n 's/^started=//p' "$meta" 2>/dev/null | sed -n '1p')" + title="$(sed -n 's/^title=//p' "$meta" 2>/dev/null | sed -n '1p')" + [ -n "$title" ] || title="Создание бэкапа" + case "$started" in ''|*[!0-9]*) started="$(date +%s)" ;; esac + now="$(date +%s)" + elapsed="$((now - started))" + + case "$status" in + running) + state_class="running" + state_text="Выполняется" + job_note="Страница обновляется каждые 2 секунды. После завершения список архивов ниже обновится автоматически." + button_text="Обновить лог" + ;; + done) + state_class="ok" + state_text="Завершено" + job_note="Готово. Список архивов ниже уже обновлен." + button_text="Обновить список" + ;; + failed) + state_class="error" + state_text="Ошибка" + job_note="Создание бэкапа завершилось с ошибкой. Подробности в журнале ниже." + button_text="Обновить список" + ;; + *) + state_class="error" + state_text="Задача не найдена" + job_note="Эта задача уже недоступна. Можно обновить страницу и посмотреть список архивов." + button_text="Обновить список" + ;; + esac + + printf '
' "$state_class" + printf '

%s

Статус: %s · Время: %s сек' "$(h "$title")" "$(h "$state_text")" "$(h "$started")" "$(h "$elapsed")" + if [ -r "$code_file" ]; then + printf ' · Код выхода: %s' "$(h "$(cat "$code_file")")" + fi + printf '

%s
' "$(self_url)" "$(h "$(param key)")" "$button_text" + printf '

%s

Журнал выполнения
' "$(h "$job_note")" + printf '
'
+	if [ -r "$log" ]; then
+		tail -n 120 "$log" | html_escape
+	else
+		printf 'Лог пока пуст. Подожди пару секунд.\n' | html_escape
+	fi
+	printf '
' + printf '' + printf '
' +} + page() { - local key output_dir include_overlay include_rom include_raw_mtd keep_days + local key output_dir include_overlay include_rom include_raw_mtd keep_days job_id job_status refresh_meta result_class result_status key="$(h "$(param key)")" output_dir="$(config_get output_dir /tmp)" include_overlay="$(config_get include_overlay 1)" include_rom="$(config_get include_rom 0)" include_raw_mtd="$(config_get include_raw_mtd 0)" keep_days="$(config_get keep_days 0)" + job_id="$ACTIVE_JOB" + if [ -z "$job_id" ] && valid_job_id "$(param job)"; then + job_id="$(param job)" + fi + job_status="" + refresh_meta="" + if [ -n "$job_id" ] && valid_job_id "$job_id"; then + job_status="$(cat "$(job_file "$job_id" status)" 2>/dev/null || true)" + if [ "$job_status" = "running" ]; then + refresh_meta="" + fi + fi http_html cat < +$refresh_meta OpenWrt Full Backup