Arav/dwelling-upload
1
0
Fork 0
Code Releases 12 Activity

Amber is replaced with Jade.

Browse Source
This commit is contained in:
Alexander Andreev 2022-02-08 04:23:38 +04:00
parent b2a5e90245
commit e529bfa353
Signed by: Arav
GPG Key ID: 1327FE8A374CC86F
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
internal/handlers/handlers.go
View File

@ -16,10 +16,10 @@ import (
"path" "path"
"time" "time"
"github.com/eknkc/amber" "github.com/Joker/jade"
) )
var defaultAmberOptions = amber.Options{PrettyPrint: false, LineNumbers: false} //var defaultAmberOptions = amber.Options{PrettyPrint: false, LineNumbers: false}
var compiledTemplates map[string]*template.Template var compiledTemplates map[string]*template.Template
@ -54,8 +54,7 @@ type UploadHandlers struct {
} }
func NewUploadHandlers(conf *configuration.Configuration, lErr, lUp, lDown *logging.Logger, uploadDirSize *int64) *UploadHandlers { func NewUploadHandlers(conf *configuration.Configuration, lErr, lUp, lDown *logging.Logger, uploadDirSize *int64) *UploadHandlers {
compiledTemplates = amber.MustCompileDir(conf.WebDir+"/templates", compileTemplates(path.Join(conf.WebDir, "templates"), lErr)
amber.DefaultDirOptions, defaultAmberOptions)
return &UploadHandlers{ return &UploadHandlers{
conf: conf, conf: conf,
@ -160,6 +159,11 @@ func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusFound) w.WriteHeader(http.StatusFound)
} }
scheme := r.Header.Get("X-Forwarded-Proto")
if scheme == "" {
scheme = "http"
}
downloadURL := path.Join("/f", fSaltedHash, fHandler.Filename) downloadURL := path.Join("/f", fSaltedHash, fHandler.Filename)
if err := compiledTemplates["uploaded"].Execute(w, &UploadedData{ if err := compiledTemplates["uploaded"].Execute(w, &UploadedData{
@ -208,3 +212,43 @@ func (h *UploadHandlers) NotFound(w http.ResponseWriter, r *http.Request) {
h.logErr.Fatalln("failed to execute 404 template:", err) h.logErr.Fatalln("failed to execute 404 template:", err)
} }
} }
func compileTemplates(dir string, lErr *logging.Logger) {
compiledTemplates = make(map[string]*template.Template)
indexStr, err := jade.ParseFile(path.Join(dir, "index.jade"))
if err != nil {
lErr.Fatalln(err)
}
indexTpl, err := template.New("index").Parse(indexStr)
if err != nil {
lErr.Fatalln(err)
}
compiledTemplates["index"] = indexTpl
uploadedStr, err := jade.ParseFile(path.Join(dir, "uploaded.jade"))
if err != nil {
lErr.Fatalln(err)
}
uploadedTpl, err := template.New("uploaded").Parse(uploadedStr)
if err != nil {
lErr.Fatalln(err)
}
compiledTemplates["uploaded"] = uploadedTpl
notfoundStr, err := jade.ParseFile(path.Join(dir, "404.jade"))
if err != nil {
lErr.Fatalln(err)
}
notfoundTpl, err := template.New("404").Parse(notfoundStr)
if err != nil {
lErr.Fatalln(err)
}
compiledTemplates["404"] = notfoundTpl
}