mirror of
https://github.com/kataras/iris.git
synced 2025-12-17 09:57:01 +00:00
Upgrade to new go errors and some minor fixes and improvements including easier debugging of invalid routes and e.t.c.
Former-commit-id: 5809157b952ccc61a67a9861470774b3a6fee024
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"html/template"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
@@ -91,6 +92,11 @@ func (s *AmberEngine) Load() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
|
||||
// change the directory field configuration, load happens after directory has been set, so we will not have any problems here.
|
||||
s.directory = dir
|
||||
return s.loadDirectory()
|
||||
|
||||
@@ -209,6 +209,11 @@ func (s *DjangoEngine) Load() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
|
||||
// change the directory field configuration, load happens after directory has been set, so we will not have any problems here.
|
||||
s.directory = dir
|
||||
return s.loadDirectory()
|
||||
|
||||
@@ -111,6 +111,10 @@ func (s *HandlebarsEngine) Load() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
|
||||
// change the directory field configuration, load happens after directory has been set, so we will not have any problems here.
|
||||
s.directory = dir
|
||||
return s.loadDirectory()
|
||||
|
||||
@@ -226,6 +226,11 @@ func (s *HTMLEngine) Load() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
|
||||
// change the directory field configuration, load happens after directory has been set, so we will not have any problems here.
|
||||
s.directory = dir
|
||||
return s.loadDirectory()
|
||||
|
||||
@@ -47,6 +47,10 @@ var jetExtensions = [...]string{
|
||||
|
||||
// Jet creates and returns a new jet view engine.
|
||||
func Jet(directory, extension string) *JetEngine {
|
||||
// if _, err := os.Stat(directory); os.IsNotExist(err) {
|
||||
// panic(err)
|
||||
// }
|
||||
|
||||
extOK := false
|
||||
for _, ext := range jetExtensions {
|
||||
if ext == extension {
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/kataras/iris/core/errors"
|
||||
)
|
||||
|
||||
// View is responsible to
|
||||
@@ -37,8 +36,6 @@ func (v *View) Len() int {
|
||||
return len(v.engines)
|
||||
}
|
||||
|
||||
var errNoViewEngineForExt = errors.New("no view engine found for '%s'")
|
||||
|
||||
// ExecuteWriter calls the correct view Engine's ExecuteWriter func
|
||||
func (v *View) ExecuteWriter(w io.Writer, filename string, layout string, bindingData interface{}) error {
|
||||
if len(filename) > 2 {
|
||||
@@ -49,7 +46,7 @@ func (v *View) ExecuteWriter(w io.Writer, filename string, layout string, bindin
|
||||
|
||||
e := v.Find(filename)
|
||||
if e == nil {
|
||||
return errNoViewEngineForExt.Format(filepath.Ext(filename))
|
||||
return fmt.Errorf("no view engine found for '%s'", filepath.Ext(filename))
|
||||
}
|
||||
|
||||
return e.ExecuteWriter(w, filename, layout, bindingData)
|
||||
|
||||
Reference in New Issue
Block a user