5991a21818
* First batch of changes for the refactor Added the support of gin in routes and other services/utils Begining implementation of JetHTML * Remove os folder * Move scrapers to own repo * Second batch of changes All .jet.html are the working templates. You can now test this PR, the index Page and upload works. If you want to complete the other html templates, you're welcome * Move captcha to util * Move uploadService to utils * Use govalidator instead of regex * Third batch of changes All the front end should as previously. I also fixed some minor things unrelated to the refactor (mostly style issues on static pages) Now errors can be accessed by importing the "errors" helpers and using the `yield errors(name="xxx")` command in templates. Same for infos. Templates are now more hierarchized with a base template "base.jet.html" which is extended depending on the context in "index_site" or "index_admin" layouts. Those layouts are extended than in every pages. Other helpers are captcha to render a captcha `yield captcha(captchaid="xxx")` And also csrf, with the command `yield csrf_field()` To translate, you don't have anymore to do `call $.T "xxx"`, you just have to do `T("xxx")`. Pages for the website part are in folders in the folder "templates/site". Pages for the admin part are in "templates/admin". Layouts are separated in "templates/layouts". Helpers and menu are in "templates/layouts/helpers" and "templates/layouts/menu". Error pages should be put in "templates/errors" * Added test on templates When adding a new template, you have to tell to template_test.go, the context of the new template (if it doesn't use the common context) * Panel admin works Now the templating part should work. The PR can now be fully tested. I think we should push the templating PR and do the routes/controllers/removal of services in another branch. So we know that this one is functional * Updated dependencies * Fixed test for modelhelper * Fix testing for commentlist * Fix travis :') * Just renamed router and removed network * Applying same SEO fix * Update form_validator.go * Added back regexp package
135 lignes
2,9 Kio
Go
135 lignes
2,9 Kio
Go
// Copyright 2014 Manu Martinez-Almeida. All rights reserved.
|
|
// Use of this source code is governed by a MIT style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package gin
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/mattn/go-isatty"
|
|
)
|
|
|
|
var (
|
|
green = string([]byte{27, 91, 57, 55, 59, 52, 50, 109})
|
|
white = string([]byte{27, 91, 57, 48, 59, 52, 55, 109})
|
|
yellow = string([]byte{27, 91, 57, 55, 59, 52, 51, 109})
|
|
red = string([]byte{27, 91, 57, 55, 59, 52, 49, 109})
|
|
blue = string([]byte{27, 91, 57, 55, 59, 52, 52, 109})
|
|
magenta = string([]byte{27, 91, 57, 55, 59, 52, 53, 109})
|
|
cyan = string([]byte{27, 91, 57, 55, 59, 52, 54, 109})
|
|
reset = string([]byte{27, 91, 48, 109})
|
|
)
|
|
|
|
func ErrorLogger() HandlerFunc {
|
|
return ErrorLoggerT(ErrorTypeAny)
|
|
}
|
|
|
|
func ErrorLoggerT(typ ErrorType) HandlerFunc {
|
|
return func(c *Context) {
|
|
c.Next()
|
|
errors := c.Errors.ByType(typ)
|
|
if len(errors) > 0 {
|
|
c.JSON(-1, errors)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Logger instances a Logger middleware that will write the logs to gin.DefaultWriter
|
|
// By default gin.DefaultWriter = os.Stdout
|
|
func Logger() HandlerFunc {
|
|
return LoggerWithWriter(DefaultWriter)
|
|
}
|
|
|
|
// LoggerWithWriter instance a Logger middleware with the specified writter buffer.
|
|
// Example: os.Stdout, a file opened in write mode, a socket...
|
|
func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
|
|
isTerm := true
|
|
|
|
if w, ok := out.(*os.File); !ok || !isatty.IsTerminal(w.Fd()) {
|
|
isTerm = false
|
|
}
|
|
|
|
var skip map[string]struct{}
|
|
|
|
if length := len(notlogged); length > 0 {
|
|
skip = make(map[string]struct{}, length)
|
|
|
|
for _, path := range notlogged {
|
|
skip[path] = struct{}{}
|
|
}
|
|
}
|
|
|
|
return func(c *Context) {
|
|
// Start timer
|
|
start := time.Now()
|
|
path := c.Request.URL.Path
|
|
|
|
// Process request
|
|
c.Next()
|
|
|
|
// Log only when path is not being skipped
|
|
if _, ok := skip[path]; !ok {
|
|
// Stop timer
|
|
end := time.Now()
|
|
latency := end.Sub(start)
|
|
|
|
clientIP := c.ClientIP()
|
|
method := c.Request.Method
|
|
statusCode := c.Writer.Status()
|
|
var statusColor, methodColor string
|
|
if isTerm {
|
|
statusColor = colorForStatus(statusCode)
|
|
methodColor = colorForMethod(method)
|
|
}
|
|
comment := c.Errors.ByType(ErrorTypePrivate).String()
|
|
|
|
fmt.Fprintf(out, "[GIN] %v |%s %3d %s| %13v | %s |%s %s %-7s %s\n%s",
|
|
end.Format("2006/01/02 - 15:04:05"),
|
|
statusColor, statusCode, reset,
|
|
latency,
|
|
clientIP,
|
|
methodColor, reset, method,
|
|
path,
|
|
comment,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
func colorForStatus(code int) string {
|
|
switch {
|
|
case code >= 200 && code < 300:
|
|
return green
|
|
case code >= 300 && code < 400:
|
|
return white
|
|
case code >= 400 && code < 500:
|
|
return yellow
|
|
default:
|
|
return red
|
|
}
|
|
}
|
|
|
|
func colorForMethod(method string) string {
|
|
switch method {
|
|
case "GET":
|
|
return blue
|
|
case "POST":
|
|
return cyan
|
|
case "PUT":
|
|
return yellow
|
|
case "DELETE":
|
|
return red
|
|
case "PATCH":
|
|
return green
|
|
case "HEAD":
|
|
return magenta
|
|
case "OPTIONS":
|
|
return white
|
|
default:
|
|
return reset
|
|
}
|
|
}
|