From b29a7472e088b3721203e2ba718fc06056efa0ec Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 16 May 2022 12:30:22 +0200
Subject: [PATCH] Write forget and copy options with correct name

---
 cmd/forget.go        |  2 +-
 internal/location.go | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cmd/forget.go b/cmd/forget.go
index 93d7137..917ecb4 100644
--- a/cmd/forget.go
+++ b/cmd/forget.go
@@ -21,7 +21,7 @@ var forgetCmd = &cobra.Command{
 		dry, _ := cmd.Flags().GetBool("dry-run")
 		for _, name := range selected {
 			location, _ := internal.GetLocation(name)
-			err := location.Forget(prune, dry)
+			err := location.DoForget(prune, dry)
 			CheckErr(err)
 		}
 	},
diff --git a/internal/location.go b/internal/location.go
index 0bfb853..07a05eb 100644
--- a/internal/location.go
+++ b/internal/location.go
@@ -43,15 +43,15 @@ type Hooks struct {
 type LocationCopy = map[string][]string
 
 type Location struct {
-	name         string               `mapstructure:",omitempty"`
-	From         []string             `mapstructure:"from,omitempty"`
-	Type         string               `mapstructure:"type,omitempty"`
-	To           []string             `mapstructure:"to,omitempty"`
-	Hooks        Hooks                `mapstructure:"hooks,omitempty"`
-	Cron         string               `mapstructure:"cron,omitempty"`
-	Options      Options              `mapstructure:"options,omitempty"`
-	ForgetOption LocationForgetOption `mapstructure:"forget,omitempty"`
-	CopyOption   LocationCopy         `mapstructure:"copy,omitempty"`
+	name    string               `mapstructure:",omitempty"`
+	From    []string             `mapstructure:"from,omitempty"`
+	Type    string               `mapstructure:"type,omitempty"`
+	To      []string             `mapstructure:"to,omitempty"`
+	Hooks   Hooks                `mapstructure:"hooks,omitempty"`
+	Cron    string               `mapstructure:"cron,omitempty"`
+	Options Options              `mapstructure:"options,omitempty"`
+	Forget  LocationForgetOption `mapstructure:"forget,omitempty"`
+	Copy    LocationCopy         `mapstructure:"copy,omitempty"`
 }
 
 func GetLocation(name string) (Location, bool) {
@@ -101,7 +101,7 @@ func (l Location) validate() error {
 	}
 
 	// Check copy option
-	for copyFrom, copyTo := range l.CopyOption {
+	for copyFrom, copyTo := range l.Copy {
 		if _, ok := GetBackend(copyFrom); !ok {
 			return fmt.Errorf(`location "%s" has an invalid backend "%s" in copy option`, l.name, copyFrom)
 		}
@@ -119,9 +119,9 @@ func (l Location) validate() error {
 	}
 
 	// Check if forget type is correct
-	if l.ForgetOption != "" {
-		if l.ForgetOption != LocationForgetYes && l.ForgetOption != LocationForgetNo && l.ForgetOption != LocationForgetPrune {
-			return fmt.Errorf("invalid value for forget option: %s", l.ForgetOption)
+	if l.Forget != "" {
+		if l.Forget != LocationForgetYes && l.Forget != LocationForgetNo && l.Forget != LocationForgetPrune {
+			return fmt.Errorf("invalid value for forget option: %s", l.Forget)
 		}
 	}
 	return nil
@@ -270,7 +270,7 @@ func (l Location) Backup(cron bool, specificBackend string) []error {
 
 		// Copy
 		if md.SnapshotID != "" {
-			for copyFrom, copyTo := range l.CopyOption {
+			for copyFrom, copyTo := range l.Copy {
 				b1, _ := GetBackend(copyFrom)
 				for _, copyToTarget := range copyTo {
 					b2, _ := GetBackend(copyToTarget)
@@ -311,8 +311,8 @@ after:
 	}
 
 	// Forget and optionally prune
-	if isSuccess && l.ForgetOption != "" && l.ForgetOption != LocationForgetNo {
-		l.Forget(l.ForgetOption == LocationForgetPrune, false)
+	if isSuccess && l.Forget != "" && l.Forget != LocationForgetNo {
+		l.DoForget(l.Forget == LocationForgetPrune, false)
 	}
 
 	if len(errors) == 0 {
@@ -321,7 +321,7 @@ after:
 	return errors
 }
 
-func (l Location) Forget(prune bool, dry bool) error {
+func (l Location) DoForget(prune bool, dry bool) error {
 	colors.PrimaryPrint("Forgetting for location \"%s\"", l.name)
 
 	for _, to := range l.To {