diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go index 312119884..4d7829e4b 100644 --- a/internal/archiver/archiver.go +++ b/internal/archiver/archiver.go @@ -67,8 +67,8 @@ func (s *ItemStats) Add(other ItemStats) { s.TreeSizeInRepo += other.TreeSizeInRepo } -// ToNoder returns a data.Node for a File. -type ToNoder interface { +// toNoder returns a data.Node for a File. +type toNoder interface { ToNode(ignoreXattrListError bool, warnf func(format string, args ...any)) (*data.Node, error) } @@ -249,7 +249,7 @@ func (arch *Archiver) trackItem(item string, previous, current *data.Node, s Ite } // nodeFromFileInfo returns the restic node from an os.FileInfo. -func (arch *Archiver) nodeFromFileInfo(snPath, filename string, meta ToNoder, ignoreXattrListError bool) (*data.Node, error) { +func (arch *Archiver) nodeFromFileInfo(snPath, filename string, meta toNoder, ignoreXattrListError bool) (*data.Node, error) { node, err := meta.ToNode(ignoreXattrListError, func(format string, args ...any) { _ = arch.error(filename, fmt.Errorf(format, args...)) }) diff --git a/internal/archiver/file_saver.go b/internal/archiver/file_saver.go index 3407cae16..313f1d19b 100644 --- a/internal/archiver/file_saver.go +++ b/internal/archiver/file_saver.go @@ -26,7 +26,7 @@ type fileSaver struct { CompleteBlob func(bytes uint64) - NodeFromFileInfo func(snPath, filename string, meta ToNoder, ignoreXattrListError bool) (*data.Node, error) + NodeFromFileInfo func(snPath, filename string, meta toNoder, ignoreXattrListError bool) (*data.Node, error) } // newFileSaver returns a new file saver. A worker pool with fileWorkers is diff --git a/internal/archiver/file_saver_test.go b/internal/archiver/file_saver_test.go index 013124601..1af322be0 100644 --- a/internal/archiver/file_saver_test.go +++ b/internal/archiver/file_saver_test.go @@ -41,7 +41,7 @@ func startFileSaver(ctx context.Context, t testing.TB, _ fs.FS) (*fileSaver, *mo saver := &mockSaver{saved: make(map[string]int)} s := newFileSaver(ctx, wg, saver, pol, workers) - s.NodeFromFileInfo = func(snPath, filename string, meta ToNoder, ignoreXattrListError bool) (*data.Node, error) { + s.NodeFromFileInfo = func(snPath, filename string, meta toNoder, ignoreXattrListError bool) (*data.Node, error) { return meta.ToNode(ignoreXattrListError, t.Logf) }