wip

internal/server/rofs/fs.go

@@ -65,6 +65,18 @@ func New(ctx context.Context, repo restic.Repository, cfg Config) (*ROFS, error)
 	return rofs, nil
 }
 
+func (rofs *ROFS) updateSnapshots(ctx context.Context) error {
+
+	entries, err := buildSnapshotEntries(ctx, rofs.repo, rofs.cfg)
+	if err != nil {
+		return err
+	}
+
+	rofs.entries = entries
+
+	return nil
+}
+
 func buildSnapshotEntries(ctx context.Context, repo restic.Repository, cfg Config) (map[string]rofsEntry, error) {
 	var snapshots restic.Snapshots
 	err := cfg.Filter.FindAll(ctx, repo, repo, nil, func(_ string, sn *restic.Snapshot, _ error) error {
@@ -83,25 +95,12 @@ func buildSnapshotEntries(ctx context.Context, repo restic.Repository, cfg Confi
 
 	list := make(map[string]rofsEntry)
 	list["foo"] = NewMemFile("foo", []byte("foobar content of file foo"), time.Now())
-	list["snapshots"] = NewMemFile("snapshots", []byte("here goes the snapshot list"), time.Now())
 
-	// list["snapshots"] = NewSnapshotsDir(cfg.PathTemplates, cfg.TimeTemplate)
+	list["snapshots"] = NewSnapshotsDir(ctx, repo, cfg.PathTemplates, cfg.TimeTemplate)
 
 	return list, nil
 }
 
-func (rofs *ROFS) updateSnapshots(ctx context.Context) error {
-
-	entries, err := buildSnapshotEntries(ctx, rofs.repo, rofs.cfg)
-	if err != nil {
-		return err
-	}
-
-	rofs.entries = entries
-
-	return nil
-}
-
 // Open opens the named file.
 //
 // When Open returns an error, it should be of type *PathError

internal/server/rofs/snapshots_dir.go

@@ -1,134 +1,148 @@
 package rofs
 
-// // SnapshotsDir implements a tree of snapshots in repo as a file system in various sub-directories.
+import (
-// type SnapshotsDir struct {
+	"context"
-// 	lastUpdate time.Time
+	"io"
+	"io/fs"
+	"time"
 
-// 	pathTemplates []string
+	"github.com/restic/restic/internal/debug"
-// 	timeTemplate  string
+	"github.com/restic/restic/internal/restic"
+)
 
-// 	// list of top-level directories
+// SnapshotsDir implements a tree of snapshots in repo as a file system in various sub-directories.
-// 	entries []rofsEntry
+type SnapshotsDir struct {
+	lastUpdate time.Time
+
+	pathTemplates []string
+	timeTemplate  string
+
+	// list of top-level directories
+	entries []rofsEntry
+
+	repo restic.Repository
+}
+
+// ensure that the interface is implemented
+var _ rofsEntry = &SnapshotsDir{}
+
+// NewSnapshotsDir initializes a new top-level snapshots directory.
+func NewSnapshotsDir(ctx context.Context, repo restic.Repository, pathTemplates []string, timeTemplate string) *SnapshotsDir {
+	dir := &SnapshotsDir{
+		pathTemplates: pathTemplates,
+		timeTemplate:  timeTemplate,
+		lastUpdate:    time.Now(),
+
+		repo: repo,
+	}
+
+	// testnames := []string{"foo", "bar", "baz", "snapshots"}
+	// for _, name := range testnames {
+	// 	dir.entries = append(dir.entries,
+	// 		fs.FileInfoToDirEntry(FileInfo{
+	// 			name:    name,
+	// 			mode:    0644,
+	// 			modtime: time.Now(),
+	// 		}))
 	// }
 
-// // ensure that the interface is implemented
+	// slices.SortFunc(dir.entries, func(a, b fs.DirEntry) int {
-// var _ rofsEntry = &SnapshotsDir{}
+	// 	if a.Name() == b.Name() {
-
+	// 		return 0
-// // NewSnapshotsDir initializes a new top-level snapshots directory.
-// func NewSnapshotsDir(pathTemplates []string, timeTemplate string) *SnapshotsDir {
-// 	dir := &SnapshotsDir{
-// 		pathTemplates: pathTemplates,
-// 		timeTemplate:  timeTemplate,
-// 		lastUpdate:    time.Now(),
 	// 	}
 
-// 	// testnames := []string{"foo", "bar", "baz", "snapshots"}
+	// 	if a.Name() < b.Name() {
-// 	// for _, name := range testnames {
+	// 		return 1
-// 	// 	dir.entries = append(dir.entries,
-// 	// 		fs.FileInfoToDirEntry(FileInfo{
-// 	// 			name:    name,
-// 	// 			mode:    0644,
-// 	// 			modtime: time.Now(),
-// 	// 		}))
-// 	// }
-
-// 	// slices.SortFunc(dir.entries, func(a, b fs.DirEntry) int {
-// 	// 	if a.Name() == b.Name() {
-// 	// 		return 0
-// 	// 	}
-
-// 	// 	if a.Name() < b.Name() {
-// 	// 		return 1
-// 	// 	}
-
-// 	// 	return -1
-// 	// })
-
-// 	// // prepare for readdir with positive n
-// 	// dir.entriesRemaining = dir.entries
-
-// 	return dir
 	// 	}
 
-// // ensure that it implements all necessary interfaces.
+	// 	return -1
-// var _ fs.ReadDirFile = &SnapshotsDir{}
+	// })
 
-// // Close closes the snapshots dir.
+	// // prepare for readdir with positive n
-// func (dir *SnapshotsDir) Close() error {
+	// dir.entriesRemaining = dir.entries
-// 	debug.Log("Close()")
 
-// 	// reset readdir list
+	return dir
-// 	// dir.entriesRemaining = dir.entries
+}
 
-// 	return nil
+// ensure that it implements all necessary interfaces.
-// }
+var _ fs.ReadDirFile = &SnapshotsDir{}
 
-// // Read is not implemented for a dir.
+// Close closes the snapshots dir.
-// func (dir *SnapshotsDir) Read([]byte) (int, error) {
+func (dir *SnapshotsDir) Close() error {
-// 	return 0, &fs.PathError{
+	debug.Log("Close()")
-// 		Op:  "read",
-// 		Err: fs.ErrInvalid,
-// 	}
-// }
 
-// // Stat returns information about the dir.
+	// reset readdir list
-// func (dir *SnapshotsDir) Stat() (fs.FileInfo, error) {
+	// dir.entriesRemaining = dir.entries
-// 	debug.Log("Stat(root)")
 
-// 	fi := FileInfo{
+	return nil
-// 		name:    "root", // use special name, this is the root node
+}
-// 		size:    0,
-// 		modtime: dir.lastUpdate,
-// 		mode:    0755,
-// 	}
 
-// 	return fi, nil
+// Read is not implemented for a dir.
-// }
+func (dir *SnapshotsDir) Read([]byte) (int, error) {
+	return 0, &fs.PathError{
+		Op:  "read",
+		Err: fs.ErrInvalid,
+	}
+}
 
-// // ReadDir returns a list of entries.
+// Stat returns information about the dir.
-// func (dir *SnapshotsDir) ReadDir(n int) ([]fs.DirEntry, error) {
+func (dir *SnapshotsDir) Stat() (fs.FileInfo, error) {
-// 	if n < 0 {
+	debug.Log("Stat(root)")
-// 		debug.Log("Readdir(root, %v), return %v entries", n, len(dir.entries))
-// 		return dir.entries, nil
-// 	}
 
-// 	// complicated pointer handling
+	fi := FileInfo{
-// 	if n > len(dir.entriesRemaining) {
+		name:    "root", // use special name, this is the root node
-// 		n = len(dir.entriesRemaining)
+		size:    0,
-// 	}
+		modtime: dir.lastUpdate,
+		mode:    0755,
+	}
 
-// 	if n == 0 {
+	return fi, nil
-// 		return nil, io.EOF
+}
-// 	}
 
-// 	list := dir.entriesRemaining[:n]
+// ReadDir returns a list of entries.
-// 	dir.entriesRemaining = dir.entriesRemaining[n:]
+func (dir *SnapshotsDir) ReadDir(n int) ([]fs.DirEntry, error) {
+	if n < 0 {
+		debug.Log("Readdir(root, %v), return %v entries", n, len(dir.entries))
+		return dir.entries, nil
+	}
 
-// 	return list, nil
+	// complicated pointer handling
-// }
+	if n > len(dir.entriesRemaining) {
+		n = len(dir.entriesRemaining)
+	}
 
-// // DirEntry returns meta data about the dir snapshots dir itself.
+	if n == 0 {
-// func (dir *SnapshotsDir) DirEntry() fs.DirEntry {
+		return nil, io.EOF
-// 	return dirEntry{
+	}
-// 		fileInfo: FileInfo{
-// 			name:    "snapshots",
-// 			mode:    fs.ModeDir | 0755,
-// 			modtime: dir.lastUpdate,
-// 		},
-// 	}
-// }
 
-// // Open opens the dir for reading.
+	list := dir.entriesRemaining[:n]
-// func (dir *SnapshotsDir) Open() (fs.File, error) {
+	dir.entriesRemaining = dir.entriesRemaining[n:]
-// 	d := &openDir{
-// 		path: "snapshots",
-// 		fileInfo: FileInfo{
-// 			name:    "snapshots",
-// 			mode:    fs.ModeDir | 0555,
-// 			modtime: dir.lastUpdate,
-// 		},
-// 		entries: dirMap2DirEntry(dir.entries),
-// 	}
 
-// 	return d
+	return list, nil
-// }
+}
+
+// DirEntry returns meta data about the dir snapshots dir itself.
+func (dir *SnapshotsDir) DirEntry() fs.DirEntry {
+	return dirEntry{
+		fileInfo: FileInfo{
+			name:    "snapshots",
+			mode:    fs.ModeDir | 0755,
+			modtime: dir.lastUpdate,
+		},
+	}
+}
+
+// Open opens the dir for reading.
+func (dir *SnapshotsDir) Open() (fs.File, error) {
+	d := &openDir{
+		path: "snapshots",
+		fileInfo: FileInfo{
+			name:    "snapshots",
+			mode:    fs.ModeDir | 0555,
+			modtime: dir.lastUpdate,
+		},
+		entries: dirMap2DirEntry(dir.entries),
+	}
+
+	return d
+}