mirrors/go-mtree
1
0
Fork 0
mirror of https://github.com/vbatts/go-mtree.git synced 2024-11-22 08:25:38 +00:00
Code Releases Activity

Merge pull request #4 from vbatts/fix_base_dir_path

Browse source 
walk: when directory is root, use "."
This commit is contained in:
Vincent Batts 2016-04-13 15:39:09 -04:00
commit a544d45c4c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
walk.go
View file

@ -36,6 +36,7 @@ func Walk(root string, exlcudes []ExcludeFunc, keywords []string) (*DirectoryHie
} }
} }
entryPathName := filepath.Base(path)
if info.IsDir() { if info.IsDir() {
creator.DH.Entries = append(creator.DH.Entries, Entry{ creator.DH.Entries = append(creator.DH.Entries, Entry{
Type: BlankType, Type: BlankType,
@ -46,13 +47,14 @@ func Walk(root string, exlcudes []ExcludeFunc, keywords []string) (*DirectoryHie
if creator.curDir != nil { if creator.curDir != nil {
creator.DH.Entries = append(creator.DH.Entries, Entry{ creator.DH.Entries = append(creator.DH.Entries, Entry{
Pos: len(creator.DH.Entries), Pos: len(creator.DH.Entries),
Raw: "# " + filepath.Join(creator.curDir.Path(), filepath.Base(path)), Raw: "# " + filepath.Join(creator.curDir.Path(), entryPathName),
Type: CommentType, Type: CommentType,
}) })
} else { } else {
entryPathName = "."
creator.DH.Entries = append(creator.DH.Entries, Entry{ creator.DH.Entries = append(creator.DH.Entries, Entry{
Pos: len(creator.DH.Entries), Pos: len(creator.DH.Entries),
Raw: "# " + filepath.Base(path), Raw: "# .",
Type: CommentType, Type: CommentType,
}) })
} }
@ -105,7 +107,7 @@ func Walk(root string, exlcudes []ExcludeFunc, keywords []string) (*DirectoryHie
} }
e := Entry{ e := Entry{
Name: filepath.Base(path), Name: entryPathName,
Pos: len(creator.DH.Entries), Pos: len(creator.DH.Entries),
Type: RelativeType, Type: RelativeType,
Set: creator.curSet, Set: creator.curSet,