Merge branch 'main' into fix/restore-error-handling

Merge pull request 'Return errors from deleteSnapshotFromLocalDB instead of swallowing them (closes #25 )' (#30 ) from fix/issue-25 into main
Reviewed-on: #30
2026-02-20 11:19:21 +01:00 · 2026-02-20 11:18:30 +01:00 · 2026-02-19 23:52:22 -08:00
1 changed files with 13 additions and 0 deletions
--- a/internal/vaultik/restore.go
+++ b/internal/vaultik/restore.go
@@ -122,6 +122,8 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {

 		if err := v.restoreFile(v.ctx, repos, file, opts.TargetDir, identity, chunkToBlobMap, blobCache, result); err != nil {
 			log.Error("Failed to restore file", "path", file.Path, "error", err)
+			result.FilesFailed++
+			result.FailedFiles = append(result.FailedFiles, file.Path.String())
 			// Continue with other files
 			continue
 		}
@@ -151,6 +153,13 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
 		result.Duration.Round(time.Second),
 	)

+	if result.FilesFailed > 0 {
+		_, _ = fmt.Fprintf(v.Stdout, "\nWARNING: %d file(s) failed to restore:\n", result.FilesFailed)
+		for _, path := range result.FailedFiles {
+			_, _ = fmt.Fprintf(v.Stdout, "  - %s\n", path)
+		}
+	}
+
 	// Run verification if requested
 	if opts.Verify {
 		if err := v.verifyRestoredFiles(v.ctx, repos, files, opts.TargetDir, result); err != nil {
@@ -171,6 +180,10 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
 		)
 	}

+	if result.FilesFailed > 0 {
+		return fmt.Errorf("%d file(s) failed to restore", result.FilesFailed)
+	}
+
 	return nil
 }
Author	SHA1	Message	Date
Jeffrey Paul	8c4ea2b870	Merge branch 'main' into fix/restore-error-handling	2026-02-20 11:19:21 +01:00
Jeffrey Paul	597b560398	Merge pull request 'Return errors from deleteSnapshotFromLocalDB instead of swallowing them (closes #25 )' (#30 ) from fix/issue-25 into main Reviewed-on: #30	2026-02-20 11:18:30 +01:00
clawbot	cafb3d45b8	fix: track and report file restore failures Restore previously logged errors for individual files but returned success even if files failed. Now tracks failed files in RestoreResult, reports them in the summary output, and returns an error if any files failed to restore. Fixes #21	2026-02-19 23:52:22 -08:00