MALIO-DEV/Supervisor
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix/backup-history' (#9) from fix/backup-history into develop
All checks were successful
Release / release (push) Successful in 25s
Details

Browse Source 
Reviewed-on: #9
This commit was merged in pull request #9.
This commit is contained in:
Kevin Boudet
2026-03-10 13:19:32 +00:00
parent 8bd78a610f 505ebd9325
commit 91d429c4dd
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/BackupList.vue
View File

@@ -82,8 +82,8 @@ watch(() => props.folder, async (folder) => {
loading.value = true loading.value = true
try { try {
const data = await $fetch<string[]>(`/api/backups?folder=${folder}`) const data = await $fetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
backups.value = data.slice(0, 6) backups.value = data
} catch (error) { } catch (error) {
console.error("Erreur récupération backups:", error) console.error("Erreur récupération backups:", error)
backups.value = [] backups.value = []
@@ -124,6 +124,9 @@ watch(() => props.folder, async (folder) => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 0.375rem; gap: 0.375rem;
max-height: calc((2.875rem * 5) + (0.375rem * 4));
overflow-y: auto;
padding-right: 0.25rem;
} }
.file-row { .file-row {

2
server/api/backups.get.ts
View File

@@ -1,7 +1,7 @@
import { execFile } from "node:child_process" import { execFile } from "node:child_process"
import folderMap from "../config/backup-folders.json" import folderMap from "../config/backup-folders.json"
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b@192.168.0.179" const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b"
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups" const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES || "200") const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES || "200")
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value) const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)

2
server/api/download.get.ts
View File

@@ -2,7 +2,7 @@ import { execFile, spawn } from "node:child_process"
import { Readable } from "node:stream" import { Readable } from "node:stream"
import folderMap from "../config/backup-folders.json" import folderMap from "../config/backup-folders.json"
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b@192.168.0.179" const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b"
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups" const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
const FOLDER_MAP = folderMap as Record<string, string> const FOLDER_MAP = folderMap as Record<string, string>

8
server/config/backup-folders.json
View File

@@ -1,7 +1,7 @@
{ {
"ferme": "bdd_recette/ferme", "ferme": "bdd-recette/ferme",
"inventory": "bdd_recette/inventory", "inventory": "bdd-recette/inventory",
"sirh": "bdd_recette/sirh", "sirh": "bdd-recette/sirh",
"user": "bdd_recette/user", "user": "bdd-recette/user",
"bitwarden": "bitwarden" "bitwarden": "bitwarden"
} }