From 77037e33c96a3376c97e021a9fc939ca906ea997 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 18 Jun 2017 13:06:52 +0200
Subject: [PATCH] Move snapshot finding functions to new file

---
 src/restic/snapshot.go      | 45 ---------------------------------
 src/restic/snapshot_find.go | 50 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 src/restic/snapshot_find.go

diff --git a/src/restic/snapshot.go b/src/restic/snapshot.go
index 71dbc0f70..11693bd52 100644
--- a/src/restic/snapshot.go
+++ b/src/restic/snapshot.go
@@ -6,8 +6,6 @@ import (
 	"os/user"
 	"path/filepath"
 	"time"
-
-	"restic/errors"
 )
 
 // Snapshot is the state of a resource at one point in time.
@@ -189,46 +187,3 @@ func (sn Snapshots) Less(i, j int) bool {
 func (sn Snapshots) Swap(i, j int) {
 	sn[i], sn[j] = sn[j], sn[i]
 }
-
-// ErrNoSnapshotFound is returned when no snapshot for the given criteria could be found.
-var ErrNoSnapshotFound = errors.New("no snapshot found")
-
-// FindLatestSnapshot finds latest snapshot with optional target/directory, tags and hostname filters.
-func FindLatestSnapshot(ctx context.Context, repo Repository, targets []string, tags []string, hostname string) (ID, error) {
-	var (
-		latest   time.Time
-		latestID ID
-		found    bool
-	)
-
-	for snapshotID := range repo.List(ctx, SnapshotFile) {
-		snapshot, err := LoadSnapshot(ctx, repo, snapshotID)
-		if err != nil {
-			return ID{}, errors.Errorf("Error listing snapshot: %v", err)
-		}
-		if snapshot.Time.After(latest) && (hostname == "" || hostname == snapshot.Hostname) && snapshot.HasTags(tags) && snapshot.HasPaths(targets) {
-			latest = snapshot.Time
-			latestID = snapshotID
-			found = true
-		}
-	}
-
-	if !found {
-		return ID{}, ErrNoSnapshotFound
-	}
-
-	return latestID, nil
-}
-
-// FindSnapshot takes a string and tries to find a snapshot whose ID matches
-// the string as closely as possible.
-func FindSnapshot(repo Repository, s string) (ID, error) {
-
-	// find snapshot id with prefix
-	name, err := Find(repo.Backend(), SnapshotFile, s)
-	if err != nil {
-		return ID{}, err
-	}
-
-	return ParseID(name)
-}
diff --git a/src/restic/snapshot_find.go b/src/restic/snapshot_find.go
new file mode 100644
index 000000000..fafff61cd
--- /dev/null
+++ b/src/restic/snapshot_find.go
@@ -0,0 +1,50 @@
+package restic
+
+import (
+	"context"
+	"restic/errors"
+	"time"
+)
+
+// ErrNoSnapshotFound is returned when no snapshot for the given criteria could be found.
+var ErrNoSnapshotFound = errors.New("no snapshot found")
+
+// FindLatestSnapshot finds latest snapshot with optional target/directory, tags and hostname filters.
+func FindLatestSnapshot(ctx context.Context, repo Repository, targets []string, tags []string, hostname string) (ID, error) {
+	var (
+		latest   time.Time
+		latestID ID
+		found    bool
+	)
+
+	for snapshotID := range repo.List(ctx, SnapshotFile) {
+		snapshot, err := LoadSnapshot(ctx, repo, snapshotID)
+		if err != nil {
+			return ID{}, errors.Errorf("Error listing snapshot: %v", err)
+		}
+		if snapshot.Time.After(latest) && (hostname == "" || hostname == snapshot.Hostname) && snapshot.HasTags(tags) && snapshot.HasPaths(targets) {
+			latest = snapshot.Time
+			latestID = snapshotID
+			found = true
+		}
+	}
+
+	if !found {
+		return ID{}, ErrNoSnapshotFound
+	}
+
+	return latestID, nil
+}
+
+// FindSnapshot takes a string and tries to find a snapshot whose ID matches
+// the string as closely as possible.
+func FindSnapshot(repo Repository, s string) (ID, error) {
+
+	// find snapshot id with prefix
+	name, err := Find(repo.Backend(), SnapshotFile, s)
+	if err != nil {
+		return ID{}, err
+	}
+
+	return ParseID(name)
+}