michael/URBM
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release URBM 2026.06.15.r011

Browse Source
This commit is contained in:
Mikei386
2026-06-15 07:34:45 +02:00
parent 1e9487e6f2
commit 0c507e0b64
8 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/urbm-2026.06.15.r010-x86_64-1.txz.sha256
Vendored
-1
View File
@@ -1 +0,0 @@
7d5a1c417b66e7c318ccc182b61b48fc725dd561e829e34ff593d88434fa334a urbm-2026.06.15.r010-x86_64-1.txz
dist/urbm-2026.06.15.r010-x86_64-1.txz → dist/urbm-2026.06.15.r011-x86_64-1.txz
Vendored
BIN
View File
Binary file not shown.
dist/urbm-2026.06.15.r011-x86_64-1.txz.sha256
Vendored
+1
View File
@@ -0,0 +1 @@
84579aa8c702a442494daa340631dc71ef485fa05bbbfdd2980a68611e226bb4 urbm-2026.06.15.r011-x86_64-1.txz
dist/urbm.plg
Vendored
+6 -2
View File
@@ -2,13 +2,17 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "urbm">
<!ENTITY author "Michael Roll">
<!ENTITY version "2026.06.15.r010">
<!ENTITY version "2026.06.15.r011">
<!ENTITY pluginURL "https://git.casaderoll.de/michael/URBM/raw/branch/main/dist/urbm.plg">
<!ENTITY packageURL "https://git.casaderoll.de/michael/URBM/raw/branch/main/dist/urbm-&version;-x86_64-1.txz">
<!ENTITY packageSHA256 "7d5a1c417b66e7c318ccc182b61b48fc725dd561e829e34ff593d88434fa334a">
<!ENTITY packageSHA256 "84579aa8c702a442494daa340631dc71ef485fa05bbbfdd2980a68611e226bb4">
]>
<PLUGIN name="&name;" author="&author;" version="&version;" pluginURL="&pluginURL;" min="7.0.0" support="https://git.casaderoll.de/michael/URBM/issues" icon="urbm.png">
<CHANGES>
### 2026.06.15.r011
- Parse Restic repository statistics correctly when progress output precedes the JSON result.
- Support compact and pretty-printed multi-line statistics JSON.
### 2026.06.15.r010
- Retry repository dashboard statistics once after safely removing stale Restic locks.
- Show the affected repository name and concrete Restic error when statistics still cannot be loaded.
internal/restic/restic.go
+17 -2
View File
@@ -2,6 +2,7 @@ package restic
import (
"bufio"
"bytes"
"context"
"encoding/json"
"errors"
@@ -217,13 +218,27 @@ func (r *Runner) stats(ctx context.Context, repo model.Repository, args []string
if err := r.run(ctx, repo, args, nil, &output); err != nil {
return Stats{}, err
}
var stats Stats
if err := json.Unmarshal(output, &stats); err != nil {
stats, err := decodeStats(output)
if err != nil {
return Stats{}, fmt.Errorf("decode repository stats: %w", err)
}
return stats, nil
}
func decodeStats(output []byte) (Stats, error) {
for index := len(output) - 1; index >= 0; index-- {
if output[index] != '{' {
continue
}
var stats Stats
decoder := json.NewDecoder(bytes.NewReader(output[index:]))
if err := decoder.Decode(&stats); err == nil {
return stats, nil
}
}
return Stats{}, errors.New("no valid statistics object in Restic output")
}
func (r *Runner) List(ctx context.Context, repo model.Repository, snapshot, path string) ([]map[string]any, error) {
args := []string{"ls", snapshot, "--json"}
if path != "" {
internal/restic/restic_test.go
+25
View File
@@ -130,6 +130,31 @@ func TestStatsUsesRequestedRepositoryCountingMode(t *testing.T) {
}
}
func TestStatsIgnoresProgressBeforePrettyPrintedJSON(t *testing.T) {
dir := t.TempDir()
script := filepath.Join(dir, "restic")
body := `#!/bin/sh
printf '%s\n' '[0:00] 100.00% 12 / 12 index files loaded'
printf '%s\n' '{'
printf '%s\n' ' "total_size": 8192,'
printf '%s\n' ' "total_file_count": 24,'
printf '%s\n' ' "total_blob_count": 16'
printf '%s\n' '}'
`
if err := os.WriteFile(script, []byte(body), 0700); err != nil {
t.Fatal(err)
}
runner := &Runner{Binary: script, RuntimeDir: dir, Secrets: fakeSecrets{"password": "secret"}}
repo := model.Repository{Type: model.RepositoryLocal, Location: "/repo", PasswordRef: "password"}
stats, err := runner.Stats(context.Background(), repo, "raw-data")
if err != nil {
t.Fatal(err)
}
if stats.TotalSize != 8192 || stats.TotalFileCount != 24 || stats.TotalBlobCount != 16 {
t.Fatalf("unexpected stats: %+v", stats)
}
}
func TestStatsUnlocksStaleRepositoryLockAndRetries(t *testing.T) {
dir := t.TempDir()
logPath := filepath.Join(dir, "commands")
plugin/urbm.plg
+5 -1
View File
@@ -2,13 +2,17 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "urbm">
<!ENTITY author "Michael Roll">
<!ENTITY version "2026.06.15.r010">
<!ENTITY version "2026.06.15.r011">
<!ENTITY pluginURL "https://git.casaderoll.de/michael/URBM/raw/branch/main/dist/urbm.plg">
<!ENTITY packageURL "https://git.casaderoll.de/michael/URBM/raw/branch/main/dist/urbm-&version;-x86_64-1.txz">
<!ENTITY packageSHA256 "REPLACE_DURING_RELEASE">
]>
<PLUGIN name="&name;" author="&author;" version="&version;" pluginURL="&pluginURL;" min="7.0.0" support="https://git.casaderoll.de/michael/URBM/issues" icon="urbm.png">
<CHANGES>
### 2026.06.15.r011
- Parse Restic repository statistics correctly when progress output precedes the JSON result.
- Support compact and pretty-printed multi-line statistics JSON.
### 2026.06.15.r010
- Retry repository dashboard statistics once after safely removing stale Restic locks.
- Show the affected repository name and concrete Restic error when statistics still cannot be loaded.
webgui/URBM.page
+4 -4
View File
@@ -9,12 +9,12 @@ Tag="URBM Unraid Restic Backup Manager backup snapshots restore"
<?php
$pluginRoot = '/plugins/urbm';
?>
<link rel="stylesheet" href="<?= $pluginRoot ?>/assets/urbm.css?v=20260615r010">
<link rel="stylesheet" href="<?= $pluginRoot ?>/assets/urbm.css?v=20260615r011">
<div id="urbm-app" data-api="<?= $pluginRoot ?>/api.php">
<header class="bu-header">
<div class="bu-brand">
<img class="bu-logo" src="<?= $pluginRoot ?>/images/urbm.png?v=20260615r010" alt="URBM-Logo">
<div><h1>URBM <span class="bu-version">2026.06.15.r010</span></h1><p>Restic Backup Manager für Unraid</p></div>
<img class="bu-logo" src="<?= $pluginRoot ?>/images/urbm.png?v=20260615r011" alt="URBM-Logo">
<div><h1>URBM <span class="bu-version">2026.06.15.r011</span></h1><p>Restic Backup Manager für Unraid</p></div>
</div>
<div id="bu-health" class="bu-health" tabindex="0" data-tooltip="Zeigt, ob die URBM-Hintergrundkomponente erreichbar ist. Beispiel: 'Daemon online' bedeutet, dass Jobs gestartet werden können.">Verbindung wird hergestellt...</div>
</header>
@@ -32,4 +32,4 @@ $pluginRoot = '/plugins/urbm';
<div id="bu-tooltip" role="tooltip" aria-hidden="true"></div>
</div>
<script>window.URBM_CSRF = <?= json_encode($var['csrf_token'] ?? '') ?>;</script>
<script src="<?= $pluginRoot ?>/assets/urbm-2026.06.15.r010.js"></script>
<script src="<?= $pluginRoot ?>/assets/urbm-2026.06.15.r011.js"></script>