diff options
author | Joe Mooring <joe.mooring@veriphor.com> | 2022-06-04 13:40:32 -0700 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-06-06 09:36:16 +0200 |
commit | 953f215f32ada15700cdd7d65471f55d72833c5c (patch) | |
tree | 34dd54c7158bd26554304bd504d612460e0567af /tpl | |
parent | 8e2fd55923a4da38eb2ddda51dc1b96943be0c56 (diff) |
tpl/path: Add path.BaseName function
Closes #9973
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/path/path.go | 16 | ||||
-rw-r--r-- | tpl/path/path_test.go | 30 |
2 files changed, 46 insertions, 0 deletions
diff --git a/tpl/path/path.go b/tpl/path/path.go index d334dd906..378b97e03 100644 --- a/tpl/path/path.go +++ b/tpl/path/path.go @@ -18,6 +18,7 @@ import ( "fmt" _path "path" "path/filepath" + "strings" "github.com/gohugoio/hugo/deps" "github.com/spf13/cast" @@ -94,6 +95,21 @@ func (ns *Namespace) Base(path any) (string, error) { return _path.Base(spath), nil } +// BaseName returns the last element of path, removing the extension if present. +// Trailing slashes are removed before extracting the last element. +// If the path is empty, Base returns ".". +// If the path consists entirely of slashes, Base returns "/". +// The input path is passed into filepath.ToSlash converting any Windows slashes +// to forward slashes. +func (ns *Namespace) BaseName(path any) (string, error) { + spath, err := cast.ToStringE(path) + if err != nil { + return "", err + } + spath = filepath.ToSlash(spath) + return strings.TrimSuffix(_path.Base(spath), _path.Ext(spath)), nil +} + // Split splits path immediately following the final slash, // separating it into a directory and file name component. // If there is no slash in path, Split returns an empty dir and diff --git a/tpl/path/path_test.go b/tpl/path/path_test.go index c9f8469e7..599d8367a 100644 --- a/tpl/path/path_test.go +++ b/tpl/path/path_test.go @@ -56,6 +56,36 @@ func TestBase(t *testing.T) { } } +func TestBaseName(t *testing.T) { + t.Parallel() + c := qt.New(t) + + for _, test := range []struct { + path any + expect any + }{ + {filepath.FromSlash(`foo/bar.txt`), `bar`}, + {filepath.FromSlash(`foo/bar/txt `), `txt `}, + {filepath.FromSlash(`foo/bar.t`), `bar`}, + {`foo.bar.txt`, `foo.bar`}, + {`.x`, ``}, + {``, `.`}, + // errors + {tstNoStringer{}, false}, + } { + + result, err := ns.BaseName(test.path) + + if b, ok := test.expect.(bool); ok && !b { + c.Assert(err, qt.Not(qt.IsNil)) + continue + } + + c.Assert(err, qt.IsNil) + c.Assert(result, qt.Equals, test.expect) + } +} + func TestDir(t *testing.T) { t.Parallel() c := qt.New(t) |