From cc12bd7a0bb1fb0ccda82d9b571eea8be9c9ed7a Mon Sep 17 00:00:00 2001 From: thesayyn Date: Tue, 24 Oct 2023 15:58:31 -0700 Subject: [PATCH] visitor pattern --- cmd/gomtree/cmd/mutate.go | 131 +++++++++++------- entry.go | 5 +- parse.go | 1 + .../{flat.relative.mtree => relative.mtree} | 13 +- 4 files changed, 93 insertions(+), 57 deletions(-) rename testdata/{flat.relative.mtree => relative.mtree} (68%) diff --git a/cmd/gomtree/cmd/mutate.go b/cmd/gomtree/cmd/mutate.go index bbcfc68..1114b5b 100644 --- a/cmd/gomtree/cmd/mutate.go +++ b/cmd/gomtree/cmd/mutate.go @@ -64,67 +64,46 @@ func mutateAction(c *cli.Context) error { return fmt.Errorf("parsing mtree %s: %w", mtreePath, err) } - dropDotDot := 0 - droppedParents := []*mtree.Entry{} + stripPrefixVisitor := stripPrefixVisitor{ + prefixes: stripPrexies, + } + tidyVisitor := tidyVisitor{ + keepComments: keepComments, + keepBlank: keepBlank, + } + visitors := []Visitor{ + &stripPrefixVisitor, + &tidyVisitor, + } + dropped := []int{} entries := []mtree.Entry{} skip: for _, entry := range spec.Entries { - if !keepComments && entry.Type == mtree.CommentType { - continue - } - if !keepBlank && entry.Type == mtree.BlankType { - continue + if entry.Parent != nil && slices.Contains(dropped, entry.Parent.Pos) { + if entry.Type == mtree.DotDotType { + // directory for this .. has been dropped so shall this + continue + } + entry.Parent = entry.Parent.Parent + // TODO: i am not sure if this is the correct behavior + entry.Raw = strings.TrimPrefix(entry.Raw, " ") } - if entry.Parent != nil && slices.Contains(droppedParents, &entry) { - entry.Parent = nil - entry.Type = mtree.FullType - entry.Raw = "" - } - - if entry.Type == mtree.FullType || entry.Type == mtree.RelativeType { - fp, err := entry.Path() - // fmt.Println("fp", fp, entry.Name) + for _, visitor := range visitors { + drop, err := visitor.Visit(&entry) if err != nil { return err } - pathSegments := strings.Split(fp, "/") - for _, prefix := range stripPrexies { - - prefixSegments := strings.Split(prefix, "/") - minLen := int(math.Min(float64(len(pathSegments)), float64(len(prefixSegments)))) - matches := make([]string, minLen) - for i := 0; i < minLen; i++ { - if pathSegments[i] == prefixSegments[i] { - matches[i] = prefixSegments[i] - } - } - - strip := strings.Join(matches, "/") - if entry.Type == mtree.FullType { - entry.Name = strings.TrimPrefix(entry.Name, strip) - entry.Name = strings.TrimPrefix(entry.Name, "/") - if entry.Name == "" { - continue skip - } - } else { - if entry.IsDir() { - dropDotDot++ - droppedParents = append(droppedParents, &entry) - } - if fp == strip { - continue skip - } - } + if drop { + dropped = append(dropped, entry.Pos) + continue skip } - } else if dropDotDot > 0 && entry.Type == mtree.DotDotType { - dropDotDot-- - continue skip } + entries = append(entries, entry) } @@ -142,3 +121,61 @@ skip: return nil } + +type Visitor interface { + Visit(entry *mtree.Entry) (bool, error) +} + +type tidyVisitor struct { + keepComments bool + keepBlank bool +} + +func (m *tidyVisitor) Visit(entry *mtree.Entry) (bool, error) { + if !m.keepComments && entry.Type == mtree.CommentType { + return true, nil + } else if !m.keepBlank && entry.Type == mtree.BlankType { + return true, nil + } + return false, nil +} + +type stripPrefixVisitor struct { + prefixes []string +} + +func (m *stripPrefixVisitor) Visit(entry *mtree.Entry) (bool, error) { + if entry.Type != mtree.FullType && entry.Type != mtree.RelativeType { + return false, nil + } + + fp, err := entry.Path() + if err != nil { + return false, err + } + pathSegments := strings.Split(fp, "/") + + for _, prefix := range m.prefixes { + + prefixSegments := strings.Split(prefix, "/") + minLen := int(math.Min(float64(len(pathSegments)), float64(len(prefixSegments)))) + matches := make([]string, minLen) + for i := 0; i < minLen; i++ { + if pathSegments[i] == prefixSegments[i] { + matches[i] = prefixSegments[i] + } + } + + strip := strings.Join(matches, "/") + if entry.Type == mtree.FullType { + entry.Name = strings.TrimPrefix(entry.Name, strip) + entry.Name = strings.TrimPrefix(entry.Name, "/") + if entry.Name == "" { + return true, nil + } + } else if fp == strip { + return true, nil + } + } + return false, nil +} diff --git a/entry.go b/entry.go index 366a15b..084d595 100644 --- a/entry.go +++ b/entry.go @@ -134,7 +134,10 @@ func (e Entry) String() string { if e.Type == SpecialType || e.Type == FullType || inKeyValSlice("type=dir", e.Keywords) { return fmt.Sprintf("%s %s", e.Name, strings.Join(KeyValToString(e.Keywords), " ")) } - return fmt.Sprintf(" %s %s", e.Name, strings.Join(KeyValToString(e.Keywords), " ")) + if e.Parent != nil && e.Type != DotDotType { + return fmt.Sprintf(" %s %s", e.Name, strings.Join(KeyValToString(e.Keywords), " ")) + } + return fmt.Sprintf("%s %s", e.Name, strings.Join(KeyValToString(e.Keywords), " ")) } // AllKeys returns the full set of KeyVal for the given entry, based on the diff --git a/parse.go b/parse.go index e385eaf..8cafba0 100644 --- a/parse.go +++ b/parse.go @@ -58,6 +58,7 @@ func ParseSpec(r io.Reader) (*DirectoryHierarchy, error) { e.Type = DotDotType e.Raw = str if creator.curDir != nil { + e.Parent = creator.curDir creator.curDir = creator.curDir.Parent } // nothing else to do here diff --git a/testdata/flat.relative.mtree b/testdata/relative.mtree similarity index 68% rename from testdata/flat.relative.mtree rename to testdata/relative.mtree index e575ec3..456e49e 100644 --- a/testdata/flat.relative.mtree +++ b/testdata/relative.mtree @@ -2,18 +2,13 @@ lib type=dir mode=0644 foo mode=0644 size=12288 time=1457644483.833957552 type=file -# ./lib/dir -lib type=dir mode=0644 - -dir type=dir mode=0644 - -# ./lib .. -# . -.. +./lib type=dir mode=0644 + + +ayo mode=0644 size=12288 time=1457644483.833957552 type=file -# ./lib/dir/sub lib/dir/sub type=dir lib/dir/sub/file.txt type=file