chore: move lockfile code to internal module

In a future commit, I'll need the lockfile code to access the config
file. This solves an import cycle.
This commit is contained in:
Boris Bera
2024-11-10 13:37:59 -05:00
parent ccca7c850f
commit 8de8d0070e
13 changed files with 23 additions and 33 deletions

View File

@@ -6,7 +6,6 @@ import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -15,9 +14,9 @@ var backupCmd = &cobra.Command{
Short: "Create backups for given locations",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err)

View File

@@ -3,7 +3,6 @@ package cmd
import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -12,9 +11,9 @@ var checkCmd = &cobra.Command{
Short: "Check if everything is setup",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
CheckErr(internal.CheckConfig())

View File

@@ -3,7 +3,6 @@ package cmd
import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -13,9 +12,9 @@ var cronCmd = &cobra.Command{
Long: `Intended to be mainly triggered by an automated system like systemd or crontab. For each location checks if a cron backup is due and runs it.`,
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
err = internal.RunCron()
CheckErr(err)

View File

@@ -5,7 +5,6 @@ import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -14,9 +13,9 @@ var execCmd = &cobra.Command{
Short: "Execute arbitrary native restic commands for given backends",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, true)
CheckErr(err)

View File

@@ -2,7 +2,6 @@ package cmd
import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -11,9 +10,9 @@ var forgetCmd = &cobra.Command{
Short: "Forget and optionally prune snapshots according the specified policies",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err)

View File

@@ -4,7 +4,6 @@ import (
"fmt"
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -14,9 +13,9 @@ var restoreCmd = &cobra.Command{
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
location, _ := cmd.Flags().GetString("location")
l, ok := internal.GetLocation(location)

View File

@@ -8,7 +8,6 @@ import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
homedir "github.com/mitchellh/go-homedir"
@@ -18,7 +17,7 @@ import (
func CheckErr(err error) {
if err != nil {
colors.Error.Fprintln(os.Stderr, "Error:", err)
lock.Unlock()
internal.Unlock()
os.Exit(1)
}
}

View File

@@ -9,7 +9,6 @@ import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@@ -33,7 +32,7 @@ To check you can run "ps aux | grep autorestic".`,
}
}
err := lock.Unlock()
err := internal.Unlock()
if err != nil {
colors.Error.Println("Could not unlock:", err)
return