mirror of
https://github.com/kopia/kopia.git
synced 2026-03-17 21:56:14 -04:00
d2288c443f
cli: major refactoring of how CLI commands are registered The goal is to eliminate flags as global variables to allow for better testing. Each command and subcommand and most sets of flags are now their own struct with 'setup()' methods that attached the flags or subcommand to the provided parent. This change is 94.3% mechanical, but is fully organic and hand-made. * introduced cli.appServices interface which provides the environment in which commands run * remove auto-maintenance global flag * removed globals in memory_tracking.go * removed globals from cli_progress.go * removed globals from the update_check.go * moved configPath into TheApp * removed remaining globals from config.go * refactored logfile to get rid of global variables * removed 'app' global variable * linter fixes * fixed password_*.go build * fixed BSD build
76 lines
2.2 KiB
Go
76 lines
2.2 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/kopia/kopia/fs"
|
|
"github.com/kopia/kopia/internal/diff"
|
|
"github.com/kopia/kopia/repo"
|
|
"github.com/kopia/kopia/snapshot/snapshotfs"
|
|
)
|
|
|
|
type commandDiff struct {
|
|
diffFirstObjectPath string
|
|
diffSecondObjectPath string
|
|
diffCompareFiles bool
|
|
diffCommandCommand string
|
|
}
|
|
|
|
func (c *commandDiff) setup(svc appServices, parent commandParent) {
|
|
cmd := parent.Command("diff", "Displays differences between two repository objects (files or directories)").Alias("compare")
|
|
cmd.Arg("object-path1", "First object/path").Required().StringVar(&c.diffFirstObjectPath)
|
|
cmd.Arg("object-path2", "Second object/path").Required().StringVar(&c.diffSecondObjectPath)
|
|
cmd.Flag("files", "Compare files by launching diff command for all pairs of (old,new)").Short('f').BoolVar(&c.diffCompareFiles)
|
|
cmd.Flag("diff-command", "Displays differences between two repository objects (files or directories)").Default(defaultDiffCommand()).Envar("KOPIA_DIFF").StringVar(&c.diffCommandCommand)
|
|
cmd.Action(svc.repositoryReaderAction(c.run))
|
|
}
|
|
|
|
func (c *commandDiff) run(ctx context.Context, rep repo.Repository) error {
|
|
ent1, err := snapshotfs.FilesystemEntryFromIDWithPath(ctx, rep, c.diffFirstObjectPath, false)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "error getting filesystem entry for %v", c.diffFirstObjectPath)
|
|
}
|
|
|
|
ent2, err := snapshotfs.FilesystemEntryFromIDWithPath(ctx, rep, c.diffSecondObjectPath, false)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "error getting filesystem entry for %v", c.diffSecondObjectPath)
|
|
}
|
|
|
|
_, isDir1 := ent1.(fs.Directory)
|
|
_, isDir2 := ent2.(fs.Directory)
|
|
|
|
if isDir1 != isDir2 {
|
|
return errors.New("arguments do diff must both be directories or both non-directories")
|
|
}
|
|
|
|
d, err := diff.NewComparer(os.Stdout)
|
|
if err != nil {
|
|
return errors.Wrap(err, "error creating comparer")
|
|
}
|
|
defer d.Close() //nolint:errcheck
|
|
|
|
if c.diffCompareFiles {
|
|
parts := strings.Split(c.diffCommandCommand, " ")
|
|
d.DiffCommand = parts[0]
|
|
d.DiffArguments = parts[1:]
|
|
}
|
|
|
|
if isDir1 {
|
|
return d.Compare(ctx, ent1, ent2)
|
|
}
|
|
|
|
return errors.New("comparing files not implemented yet")
|
|
}
|
|
|
|
func defaultDiffCommand() string {
|
|
if isWindows() {
|
|
return "cmp"
|
|
}
|
|
|
|
return "diff -u"
|
|
}
|