resource: Fix broken build - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 0cc936583ba14b2dc6451843f897abbf550cf091
DIR parent c15c7da42a1c7bc535cc16cca2b341526f8cf169
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 3 Sep 2018 09:22:36 +0200
resource: Fix broken build
Diffstat:
M resource/bundler/bundler.go | 7 ++++---
M resource/create/create.go | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
---
DIR diff --git 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 {
DIR diff --git 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)})