mirror of
https://github.com/kopia/kopia.git
synced 2026-01-02 11:37:54 -05:00
9b68189d29
Added functionality to calculate aggregate statistics when comparing what's changed between snapshots using kopia diff Statistics collected during snapshot diff computation includes: - files added/removed/modified - dirs added/removed/modified - files/dirs with metadata changes but same underlying content (OID) Testing approach: Added a test for verifying stats collected when comparing two directories with the same objectID but metadata changes across snapshots (dir mode, dir mod time, dir owner, etc), expectation is all the appropriate dir stats fields are updated. Added another test for verifying stats collected when comparing two directories with similar file contents but the metadata for the files have changed between snapshots but content remains unchanged. Expectation is all the relevant file level stats fields are updated. Existing tests have been updated due to stats now being printed in addition to previous output.
93 lines
2.6 KiB
Go
93 lines
2.6 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"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
|
|
|
|
out textOutput
|
|
}
|
|
|
|
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(svc.EnvName("KOPIA_DIFF")).StringVar(&c.diffCommandCommand)
|
|
cmd.Action(svc.repositoryReaderAction(c.run))
|
|
|
|
c.out.setup(svc)
|
|
}
|
|
|
|
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 to diff must both be directories or both non-directories")
|
|
}
|
|
|
|
d, err := diff.NewComparer(c.out.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 {
|
|
snapshotDiffStats, err := d.Compare(ctx, ent1, ent2)
|
|
if err != nil {
|
|
return errors.Wrap(err, "error comparing directories")
|
|
}
|
|
|
|
b, err := json.Marshal(snapshotDiffStats)
|
|
if err != nil {
|
|
return errors.Wrap(err, "error marshaling computed snapshot diff stats")
|
|
}
|
|
|
|
fmt.Fprintf(c.out.stdout(), "%s", b) //nolint:errcheck
|
|
|
|
return nil
|
|
}
|
|
|
|
return errors.New("comparing files not implemented yet")
|
|
}
|
|
|
|
func defaultDiffCommand() string {
|
|
if isWindows() {
|
|
return "cmp"
|
|
}
|
|
|
|
return "diff -u"
|
|
}
|