github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 19:42:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

Load templates from the Afero source fs

Browse source 
Fixes #2321
This commit is contained in:
Bjørn Erik Pedersen 2016-07-30 17:16:04 +02:00
parent 5f5fccbc36
commit ec23aa998a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tpl/template.go
View file

@ -15,6 +15,12 @@ package tpl
import ( import (
"fmt" "fmt"
"html/template"
"io"
"os"
"path/filepath"
"strings"
"github.com/eknkc/amber" "github.com/eknkc/amber"
"github.com/spf13/afero" "github.com/spf13/afero"
bp "github.com/spf13/hugo/bufferpool" bp "github.com/spf13/hugo/bufferpool"
@ -22,11 +28,6 @@ import (
"github.com/spf13/hugo/hugofs" "github.com/spf13/hugo/hugofs"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"github.com/yosssi/ace" "github.com/yosssi/ace"
"html/template"
"io"
"os"
"path/filepath"
"strings"
) )
var localTemplates *template.Template var localTemplates *template.Template
@ -376,7 +377,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", absPath, err) jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", absPath, err)
return nil return nil
} }
linkfi, err := os.Stat(link) linkfi, err := hugofs.Source().Stat(link)
if err != nil { if err != nil {
jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err) jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
return nil return nil
@ -414,7 +415,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
// This may be a view that shouldn't have base template // This may be a view that shouldn't have base template
// Have to look inside it to make sure // Have to look inside it to make sure
needsBase, err := helpers.FileContainsAny(path, innerMarkers, hugofs.Os()) needsBase, err := helpers.FileContainsAny(path, innerMarkers, hugofs.Source())
if err != nil { if err != nil {
return err return err
} }
@ -442,7 +443,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
} }
for _, pathToCheck := range pathsToCheck { for _, pathToCheck := range pathsToCheck {
if ok, err := helpers.Exists(pathToCheck, hugofs.Os()); err == nil && ok { if ok, err := helpers.Exists(pathToCheck, hugofs.Source()); err == nil && ok {
baseTemplatePath = pathToCheck baseTemplatePath = pathToCheck
break break
} }