chiu
/
filebrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

New errors page

This commit is contained in:
Henrique Dias 2016-07-06 12:00:28 +01:00
parent 607f2268d0
commit 9a65508048
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
errors/errors.go Normal file
View File

@ -0,0 +1,60 @@
package errors
import (
"net/http"
"strconv"
"strings"
)
const template = `<!DOCTYPE html>
<html>
<head>
<title>TITLE</title>
<style>
html {
background-color: #2196f3;
color: #fff;
font-family: sans-serif;
}
code {
background-color: rgba(0,0,0,0.1);
border-radius: 5px;
padding: 1em;
display: block;
box-sizing: border-box;
}
.center {
max-width: 40em;
margin: 2em auto 0;
}
a {
text-decoration: none;
color: #eee;
font-weight: bold;
}
</style>
</head>
<body>
<div class="center">
<h1>TITLE</h1>
<p>Try reloading the page or hitting the back button. If this error persists, it seems that you may have found a bug! Please create an issue at <a href="https://github.com/hacdias/caddy-filemanager/issues">hacdias/caddy-filemanager</a> repository on GitHub with the code below.</p>
<code>CODE</code>
</div>
</html>`
// PrintHTML prints the error page
func PrintHTML(w http.ResponseWriter, code int, err error) (int, error) {
tpl := template
tpl = strings.Replace(tpl, "TITLE", strconv.Itoa(code)+" "+http.StatusText(code), -1)
tpl = strings.Replace(tpl, "CODE", err.Error(), -1)
_, err = w.Write([]byte(tpl))
if err != nil {
return http.StatusInternalServerError, err
}
return http.StatusOK, nil
}

10
filemanager.go
View File

@ -21,6 +21,7 @@ import (
"github.com/hacdias/caddy-filemanager/assets" "github.com/hacdias/caddy-filemanager/assets"
"github.com/hacdias/caddy-filemanager/config" "github.com/hacdias/caddy-filemanager/config"
"github.com/hacdias/caddy-filemanager/directory" "github.com/hacdias/caddy-filemanager/directory"
"github.com/hacdias/caddy-filemanager/errors"
"github.com/hacdias/caddy-filemanager/page" "github.com/hacdias/caddy-filemanager/page"
"github.com/mholt/caddy/caddyhttp/httpserver" "github.com/mholt/caddy/caddyhttp/httpserver"
) )
@ -50,6 +51,9 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
if r.Method != http.MethodPost && !serveAssets { if r.Method != http.MethodPost && !serveAssets {
fi, code, err = directory.GetInfo(r.URL, c) fi, code, err = directory.GetInfo(r.URL, c)
if err != nil { if err != nil {
if r.Method == http.MethodGet {
return errors.PrintHTML(w, code, err)
}
return code, err return code, err
} }
@ -89,7 +93,11 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
} }
} }
return fi.ServeAsHTML(w, r, c) code, err := fi.ServeAsHTML(w, r, c)
if err != nil {
return errors.PrintHTML(w, code, err)
}
return code, err
case http.MethodPut: case http.MethodPut:
if fi.IsDir { if fi.IsDir {
return http.StatusNotAcceptable, nil return http.StatusNotAcceptable, nil