From db5b7303c254af467a6458d9025f825ab50b452e Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Wed, 22 Sep 2021 21:06:18 +0200 Subject: export unprefix in utils and fix error msg --- repo.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'repo.go') diff --git a/repo.go b/repo.go index f36bb65..dc61d01 100644 --- a/repo.go +++ b/repo.go @@ -38,7 +38,6 @@ import ( "os" "path/filepath" "reflect" - "strings" "sync" "github.com/chmduquesne/rollinghash/rabinkarp64" @@ -215,15 +214,14 @@ func listFiles(path string) []File { } func unprefixFiles(files []File, prefix string) (ret []File) { + var err error ret = make([]File, len(files)) - preSize := len(prefix) for i, f := range files { - if !strings.HasPrefix(f.Path, prefix) { - logger.Warning(f.Path, "is not prefixed by", prefix) + if f.Path, err = utils.Unprefix(f.Path, prefix); err != nil { + logger.Warning(err) } else { - f.Path = f.Path[preSize:] + ret[i] = f } - ret[i] = f } return } -- cgit v1.2.3