From c5da90a5b735cb14ae9352a7ecde7e9da0dc86c7 Mon Sep 17 00:00:00 2001 From: Konrad Wojas Date: Thu, 26 Oct 2017 14:02:29 +0800 Subject: [PATCH] Add --last flag to snapshots command Add --last flag to snapshots command to only show the last entry for any (hostname, paths) combination. This makes it easier to check when various paths were last backed up. --- cmd/restic/cmd_snapshots.go | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/cmd/restic/cmd_snapshots.go b/cmd/restic/cmd_snapshots.go index 12795201a..5dfb45e97 100644 --- a/cmd/restic/cmd_snapshots.go +++ b/cmd/restic/cmd_snapshots.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "sort" + "strings" "github.com/restic/restic/internal/restic" "github.com/spf13/cobra" @@ -29,6 +30,7 @@ type SnapshotOptions struct { Tags restic.TagLists Paths []string Compact bool + Last bool } var snapshotOptions SnapshotOptions @@ -41,6 +43,7 @@ func init() { f.Var(&snapshotOptions.Tags, "tag", "only consider snapshots which include this `taglist` (can be specified multiple times)") f.StringArrayVar(&snapshotOptions.Paths, "path", nil, "only consider snapshots for this `path` (can be specified multiple times)") f.BoolVarP(&snapshotOptions.Compact, "compact", "c", false, "use compact format") + f.BoolVar(&snapshotOptions.Last, "last", false, "only show the last snapshot for each host and path") } func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) error { @@ -64,6 +67,11 @@ func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) erro for sn := range FindFilteredSnapshots(ctx, repo, opts.Host, opts.Tags, opts.Paths, args) { list = append(list, sn) } + + if opts.Last { + list = FilterLastSnapshots(list) + } + sort.Sort(sort.Reverse(list)) if gopts.JSON { @@ -78,6 +86,42 @@ func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) erro return nil } +// filterLastSnapshotsKey is used by FilterLastSnapshots. +type filterLastSnapshotsKey struct { + Hostname string + JoinedPaths string +} + +// newFilterLastSnapshotsKey initializes a filterLastSnapshotsKey from a Snapshot +func newFilterLastSnapshotsKey(sn *restic.Snapshot) filterLastSnapshotsKey { + // Shallow slice copy + var paths = make([]string, len(sn.Paths)) + copy(paths, sn.Paths) + sort.Strings(paths) + return filterLastSnapshotsKey{sn.Hostname, strings.Join(paths, "|")} +} + +// FilterLastSnapshots filters a list of snapshots to only return the last +// entry for each hostname and path. If the snapshot contains multiple paths, +// they will be joined and treated as one item. +func FilterLastSnapshots(list restic.Snapshots) restic.Snapshots { + // Sort the snapshots so that the newer ones are listed first + sort.SliceStable(list, func(i, j int) bool { + return list[i].Time.After(list[j].Time) + }) + + var results restic.Snapshots + seen := make(map[filterLastSnapshotsKey]bool) + for _, sn := range list { + key := newFilterLastSnapshotsKey(sn) + if !seen[key] { + seen[key] = true + results = append(results, sn) + } + } + return results +} + // PrintSnapshots prints a text table of the snapshots in list to stdout. func PrintSnapshots(stdout io.Writer, list restic.Snapshots, compact bool) {