From 0cc936583ba14b2dc6451843f897abbf550cf091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 3 Sep 2018 09:22:36 +0200 Subject: resource: Fix broken build --- resource/bundler/bundler.go | 7 ++++--- resource/create/create.go | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'resource') diff --git a/resource/bundler/bundler.go b/resource/bundler/bundler.go index 4b1718b0d..39ce9b521 100644 --- a/resource/bundler/bundler.go +++ b/resource/bundler/bundler.go @@ -19,6 +19,7 @@ import ( "io" "path/filepath" + "github.com/gohugoio/hugo/common/hugio" "github.com/gohugoio/hugo/media" "github.com/gohugoio/hugo/resource" ) @@ -36,7 +37,7 @@ func New(rs *resource.Spec) *Client { type multiReadSeekCloser struct { mr io.Reader - sources []resource.ReadSeekCloser + sources []hugio.ReadSeekCloser } 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() } - concatr := func() (resource.ReadSeekCloser, error) { - var rcsources []resource.ReadSeekCloser + concatr := func() (hugio.ReadSeekCloser, error) { + var rcsources []hugio.ReadSeekCloser for _, s := range resources { rcr, ok := s.(resource.ReadSeekCloserResource) if !ok { diff --git a/resource/create/create.go b/resource/create/create.go index e9d7b6de4..0f909a36d 100644 --- a/resource/create/create.go +++ b/resource/create/create.go @@ -20,6 +20,7 @@ import ( "github.com/spf13/afero" + "github.com/gohugoio/hugo/common/hugio" "github.com/gohugoio/hugo/resource" ) @@ -53,8 +54,8 @@ func (c *Client) FromString(targetPath, content string) (resource.Resource, erro c.rs.BaseFs.Resources.Fs, resource.ResourceSourceDescriptor{ LazyPublish: true, - OpenReadSeekCloser: func() (resource.ReadSeekCloser, error) { - return resource.NewReadSeekerNoOpCloserFromString(content), nil + OpenReadSeekCloser: func() (hugio.ReadSeekCloser, error) { + return hugio.NewReadSeekerNoOpCloserFromString(content), nil }, RelTargetFilename: filepath.Clean(targetPath)}) -- cgit v1.2.3