Mirror/filebrowser
1
0
Fork 0
mirror of https://github.com/filebrowser/filebrowser.git synced 2024-06-07 23:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update Hugo

Browse Source
This commit is contained in:
Henrique Dias 2016-11-14 20:19:31 +00:00
parent a2abf5b3ec
commit 2198a57aaf
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hugo.go
View File

@ -20,8 +20,8 @@ import (
"github.com/hacdias/caddy-filemanager" "github.com/hacdias/caddy-filemanager"
"github.com/hacdias/caddy-filemanager/assets" "github.com/hacdias/caddy-filemanager/assets"
"github.com/hacdias/caddy-filemanager/directory"
"github.com/hacdias/caddy-filemanager/frontmatter" "github.com/hacdias/caddy-filemanager/frontmatter"
"github.com/hacdias/caddy-filemanager/handlers"
"github.com/hacdias/caddy-filemanager/utils/variables" "github.com/hacdias/caddy-filemanager/utils/variables"
"github.com/hacdias/caddy-hugo/utils/commands" "github.com/hacdias/caddy-hugo/utils/commands"
"github.com/mholt/caddy/caddyhttp/httpserver" "github.com/mholt/caddy/caddyhttp/httpserver"
@ -69,15 +69,11 @@ func (h Hugo) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
frontmatter = "toml" frontmatter = "toml"
} }
http.Redirect(w, r, h.FileManager.Configs[0].AbsoluteURL+"/config."+frontmatter, http.StatusTemporaryRedirect) http.Redirect(w, r, h.FileManager.Configs[0].AbsoluteURL()+"/config."+frontmatter, http.StatusTemporaryRedirect)
return 0, nil return 0, nil
} }
if r.Method == http.MethodPost && r.Header.Get("archetype") != "" { if r.Method == http.MethodPost && r.Header.Get("archetype") != "" {
if !h.FileManager.Configs[0].CheckToken(r) {
return http.StatusForbidden, nil
}
filename := r.Header.Get("Filename") filename := r.Header.Get("Filename")
archetype := r.Header.Get("archetype") archetype := r.Header.Get("archetype")
@ -97,8 +93,7 @@ func (h Hugo) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
return http.StatusOK, nil return http.StatusOK, nil
} }
if directory.CanBeEdited(r.URL.Path) && r.Method == http.MethodPut { if canBeEdited(r.URL.Path) && r.Method == http.MethodPut {
// NOTE: File Manager already checks the security token
code, err := h.FileManager.ServeHTTP(w, r) code, err := h.FileManager.ServeHTTP(w, r)
if err != nil { if err != nil {
@ -188,7 +183,7 @@ func (h Hugo) Schedule(w http.ResponseWriter, r *http.Request) (int, error) {
delete(front.(map[string]interface{}), "Draft") delete(front.(map[string]interface{}), "Draft")
} }
fm, _, err := directory.ParseFrontMatter(front, h.FileManager.Configs[0].FrontMatter) fm, err := handlers.ParseFrontMatter(front, h.FileManager.Configs[0].FrontMatter)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
@ -211,6 +206,33 @@ func (h Hugo) Schedule(w http.ResponseWriter, r *http.Request) (int, error) {
return http.StatusOK, nil return http.StatusOK, nil
} }
func canBeEdited(name string) bool {
extensions := [...]string{
".md", ".markdown", ".mdown", ".mmark",
".asciidoc", ".adoc", ".ad",
".rst",
".json", ".toml", ".yaml", ".csv", ".xml", ".rss", ".conf", ".ini",
".tex", ".sty",
".css", ".sass", ".scss",
".js",
".html",
".txt", ".rtf",
".sh", ".bash", ".ps1", ".bat", ".cmd",
".php", ".pl", ".py",
"Caddyfile",
".c", ".cc", ".h", ".hh", ".cpp", ".hpp", ".f90",
".f", ".bas", ".d", ".ada", ".nim", ".cr", ".java", ".cs", ".vala", ".vapi",
}
for _, extension := range extensions {
if strings.HasSuffix(name, extension) {
return true
}
}
return false
}
// serveAssets provides the needed assets for the front-end // serveAssets provides the needed assets for the front-end
func serveAssets(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { func serveAssets(w http.ResponseWriter, r *http.Request, c *Config) (int, error) {
// gets the filename to be used with Assets function // gets the filename to be used with Assets function

3
setup.go
View File

@ -13,7 +13,6 @@ import (
"github.com/hacdias/caddy-filemanager" "github.com/hacdias/caddy-filemanager"
"github.com/hacdias/caddy-filemanager/config" "github.com/hacdias/caddy-filemanager/config"
"github.com/hacdias/caddy-filemanager/directory"
"github.com/hacdias/caddy-filemanager/frontmatter" "github.com/hacdias/caddy-filemanager/frontmatter"
"github.com/hacdias/caddy-hugo/utils/commands" "github.com/hacdias/caddy-hugo/utils/commands"
"github.com/mholt/caddy" "github.com/mholt/caddy"
@ -200,7 +199,7 @@ func getFrontMatter(conf *Config) string {
log.Println(err) log.Println(err)
fmt.Printf("Can't get the default frontmatter from the configuration. %s will be used.\n", format) fmt.Printf("Can't get the default frontmatter from the configuration. %s will be used.\n", format)
} else { } else {
bytes = directory.AppendFrontMatterRune(bytes, format) bytes = frontmatter.AppendRune(bytes, format)
f, err := frontmatter.Unmarshal(bytes) f, err := frontmatter.Unmarshal(bytes)
if err != nil { if err != nil {