KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

restic: cleanup arguments of findLatestSnapshot

Browse source
This commit is contained in:
Michael Eischer 2022-10-03 14:41:03 +02:00
parent 61e827ae4f
commit b50f48594d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/restic/snapshot_find.go
View file

@ -13,12 +13,12 @@ import (
var ErrNoSnapshotFound = errors.New("no snapshot found") var ErrNoSnapshotFound = errors.New("no snapshot found")
// findLatestSnapshot finds latest snapshot with optional target/directory, tags, hostname, and timestamp filters. // findLatestSnapshot finds latest snapshot with optional target/directory, tags, hostname, and timestamp filters.
func findLatestSnapshot(ctx context.Context, be Lister, loader LoaderUnpacked, targets []string, func findLatestSnapshot(ctx context.Context, be Lister, loader LoaderUnpacked,
tagLists []TagList, hostnames []string, timeStampLimit *time.Time) (ID, error) { hosts []string, tags []TagList, paths []string, timeStampLimit *time.Time) (ID, error) {
var err error var err error
absTargets := make([]string, 0, len(targets)) absTargets := make([]string, 0, len(paths))
for _, target := range targets { for _, target := range paths {
if !filepath.IsAbs(target) { if !filepath.IsAbs(target) {
target, err = filepath.Abs(target) target, err = filepath.Abs(target)
if err != nil { if err != nil {
@ -47,11 +47,11 @@ func findLatestSnapshot(ctx context.Context, be Lister, loader LoaderUnpacked, t
return nil return nil
} }
if !snapshot.HasHostname(hostnames) { if !snapshot.HasHostname(hosts) {
return nil return nil
} }
if !snapshot.HasTagList(tagLists) { if !snapshot.HasTagList(tags) {
return nil return nil
} }
@ -91,7 +91,7 @@ func FindSnapshot(ctx context.Context, be Lister, s string) (ID, error) {
func FindFilteredSnapshot(ctx context.Context, be Lister, loader LoaderUnpacked, hosts []string, tags []TagList, paths []string, timeStampLimit *time.Time, snapshotID string) (ID, error) { func FindFilteredSnapshot(ctx context.Context, be Lister, loader LoaderUnpacked, hosts []string, tags []TagList, paths []string, timeStampLimit *time.Time, snapshotID string) (ID, error) {
if snapshotID == "latest" { if snapshotID == "latest" {
id, err := findLatestSnapshot(ctx, be, loader, paths, tags, hosts, timeStampLimit) id, err := findLatestSnapshot(ctx, be, loader, hosts, tags, paths, timeStampLimit)
if err == ErrNoSnapshotFound { if err == ErrNoSnapshotFound {
err = fmt.Errorf("snapshot filter (Paths:%v Tags:%v Hosts:%v): %w", paths, tags, hosts, err) err = fmt.Errorf("snapshot filter (Paths:%v Tags:%v Hosts:%v): %w", paths, tags, hosts, err)
} }
@ -124,7 +124,7 @@ func FindFilteredSnapshots(ctx context.Context, be Lister, loader LoaderUnpacked
usedFilter = true usedFilter = true
id, err = findLatestSnapshot(ctx, be, loader, paths, tags, hosts, nil) id, err = findLatestSnapshot(ctx, be, loader, hosts, tags, paths, nil)
if err == ErrNoSnapshotFound { if err == ErrNoSnapshotFound {
err = errors.Errorf("no snapshot matched given filter (Paths:%v Tags:%v Hosts:%v)", paths, tags, hosts) err = errors.Errorf("no snapshot matched given filter (Paths:%v Tags:%v Hosts:%v)", paths, tags, hosts)
} }