From 8b0c381808c7fcef80c81b4bb169833b208f0823 Mon Sep 17 00:00:00 2001 From: corebreaker Date: Fri, 21 Jul 2017 16:46:51 +0300 Subject: [PATCH] Resolve {%extends%} & {%include%} tags problem Former-commit-id: 2f52b831993832cc8c7dd4e7aff55848b3266e0a --- view/django.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/view/django.go b/view/django.go index 93cfca45..efe55249 100644 --- a/view/django.go +++ b/view/django.go @@ -1,10 +1,12 @@ package view import ( + "bytes" "fmt" "io" "io/ioutil" "os" + stdPath "path" "path/filepath" "strings" "sync" @@ -22,6 +24,35 @@ type ( FilterFunction func(in *Value, param *Value) (out *Value, err *Error) ) +type tDjangoAssetLoader struct { + baseDir string + assetGet func(name string) ([]byte, error) +} + +// Abs calculates the path to a given template. Whenever a path must be resolved +// due to an import from another template, the base equals the parent template's path. +func (dal *tDjangoAssetLoader) Abs(base, name string) string { + if stdPath.IsAbs(name) { + return name + } + + return stdPath.Join(dal.baseDir, name) +} + +// Get returns an io.Reader where the template's content can be read from. +func (dal *tDjangoAssetLoader) Get(path string) (io.Reader, error) { + if stdPath.IsAbs(path) { + path = path[1:] + } + + res, err := dal.assetGet(path) + if err { + return nil, err + } + + return bytes.NewBuffer(res), nil +} + // DjangoEngine contains the amber view engine structure. type DjangoEngine struct { // files configuration