diff --git a/go.mod b/go.mod index 635c28bb..5c98b997 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/reconquest/pkg v1.3.0 github.com/reconquest/regexputil-go v0.0.0-20160905154124-38573e70c1f4 github.com/stretchr/testify v1.8.1 + golang.org/x/tools v0.7.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index cb5e6e27..56e730c6 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/zazab/zhash v0.0.0-20210630080733-6e809466f8d3 h1:BhVaeQJc3xalHGONn215FylzuxdQBIT3d/aRjDg4nXQ= github.com/zazab/zhash v0.0.0-20210630080733-6e809466f8d3/go.mod h1:NtepZ8TEXErPsmQDMUoN72f8aIy4+xNinSJ3f1giess= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/mark/link.go b/pkg/mark/link.go index edde74b6..2a5e3550 100644 --- a/pkg/mark/link.go +++ b/pkg/mark/link.go @@ -11,6 +11,7 @@ import ( "github.com/kovetskiy/mark/pkg/confluence" "github.com/reconquest/karma-go" "github.com/reconquest/pkg/log" + "golang.org/x/tools/godoc/util" ) type LinkSubstitution struct { @@ -43,7 +44,6 @@ func ResolveRelativeLinks( match.filename, match.hash, ) - resolved, err := resolveLink(api, base, match, spaceFromCli, titleFromH1) if err != nil { return nil, karma.Format(err, "resolve link: %q", match.full) @@ -85,6 +85,11 @@ func resolveLink( } linkContents, err := os.ReadFile(filepath) + + if !util.IsText(linkContents) { + return "", nil + } + if err != nil { return "", karma.Format(err, "read file: %s", filepath) }