mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-29 15:10:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

resource: Fix broken build

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2018-09-03 09:22:36 +02:00
parent c15c7da42a
commit 0cc936583b
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resource/bundler/bundler.go
View file

@ -19,6 +19,7 @@ import (
"io" "io"
"path/filepath" "path/filepath"
"github.com/gohugoio/hugo/common/hugio"
"github.com/gohugoio/hugo/media" "github.com/gohugoio/hugo/media"
"github.com/gohugoio/hugo/resource" "github.com/gohugoio/hugo/resource"
) )
@ -36,7 +37,7 @@ func New(rs *resource.Spec) *Client {
type multiReadSeekCloser struct { type multiReadSeekCloser struct {
mr io.Reader mr io.Reader
sources []resource.ReadSeekCloser sources []hugio.ReadSeekCloser
} }
func (r *multiReadSeekCloser) Read(p []byte) (n int, err error) { func (r *multiReadSeekCloser) Read(p []byte) (n int, err error) {
@ -75,8 +76,8 @@ func (c *Client) Concat(targetPath string, resources resource.Resources) (resour
resolvedm = r.MediaType() resolvedm = r.MediaType()
} }
concatr := func() (resource.ReadSeekCloser, error) { concatr := func() (hugio.ReadSeekCloser, error) {
var rcsources []resource.ReadSeekCloser var rcsources []hugio.ReadSeekCloser
for _, s := range resources { for _, s := range resources {
rcr, ok := s.(resource.ReadSeekCloserResource) rcr, ok := s.(resource.ReadSeekCloserResource)
if !ok { if !ok {

5
resource/create/create.go
View file

@ -20,6 +20,7 @@ import (
"github.com/spf13/afero" "github.com/spf13/afero"
"github.com/gohugoio/hugo/common/hugio"
"github.com/gohugoio/hugo/resource" "github.com/gohugoio/hugo/resource"
) )
@ -53,8 +54,8 @@ func (c *Client) FromString(targetPath, content string) (resource.Resource, erro
c.rs.BaseFs.Resources.Fs, c.rs.BaseFs.Resources.Fs,
resource.ResourceSourceDescriptor{ resource.ResourceSourceDescriptor{
LazyPublish: true, LazyPublish: true,
OpenReadSeekCloser: func() (resource.ReadSeekCloser, error) { OpenReadSeekCloser: func() (hugio.ReadSeekCloser, error) {
return resource.NewReadSeekerNoOpCloserFromString(content), nil return hugio.NewReadSeekerNoOpCloserFromString(content), nil
}, },
RelTargetFilename: filepath.Clean(targetPath)}) RelTargetFilename: filepath.Clean(targetPath)})