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

restructure page

This commit is contained in:
Henrique Dias 2016-06-23 22:27:13 +01:00
parent 07b6459e54
commit 8b7c83539a
6 changed files with 150 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/public/js/application.js
View File

@ -349,6 +349,18 @@ var localizeDatetime = function (e, index, ar) {
} }
document.addEventListener("DOMContentLoaded", function (event) { document.addEventListener("DOMContentLoaded", function (event) {
document.getElementById("logout").addEventListener("click", event => {
let request = new XMLHttpRequest();
request.open('GET', window.location.pathname, true, "username", "password");
request.send();
request.onreadystatechange = function () {
if (request.readyState == 4) {
window.location = "/";
}
}
});
var timeList = Array.prototype.slice.call(document.getElementsByTagName("time")); var timeList = Array.prototype.slice.call(document.getElementsByTagName("time"));
timeList.forEach(localizeDatetime); timeList.forEach(localizeDatetime);
@ -375,7 +387,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
let rename = document.getElementById("rename"); let rename = document.getElementById("rename");
if (rename) { if (rename) {
rename.addEventListener("click", renameEvent); rename.addEventListener("click", renameEvent);
} }
if (document.getElementById("listing")) { if (document.getElementById("listing")) {

18
assets/templates/base.tmpl
View File

@ -5,19 +5,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ .Config.BaseURL }}/_filemanagerinternal/css/styles.css"> <link rel="stylesheet" href="{{ .Config.BaseURL }}/_filemanagerinternal/css/styles.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
<script src="{{ .Config.BaseURL }}/_filemanagerinternal/js/application.js"></script> <script src="{{ .Config.BaseURL }}/_filemanagerinternal/js/application.js"></script>
{{ if ne .Config.StyleSheet "" }} {{ if ne .Config.StyleSheet "" }}
<style> <style>
{{.Config.StyleSheet}} {{.Config.StyleSheet}}
</style> </style>
{{ end }} {{ end }}
{{ if .Config.HugoEnabled }}
<!-- Hugo plugin stuff -->
<link rel="stylesheet" href="{{ .Config.BaseURL }}/_hugointernal/css/styles.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
<script src="{{ .Config.BaseURL }}/_hugointernal/js/application.js"></script>
{{ end }}
</head> </head>
<body> <body>
<header> <header>
@ -65,10 +63,11 @@
<i class="material-icons">settings</i> <i class="material-icons">settings</i>
</div> </div>
</a> </a>
<div class="action" id="logout">
<i class="material-icons">exit_to_app</i>
</div>
{{ end }} {{ end }}
<div class="action" id="logout">
<i class="material-icons">exit_to_app</i>
</div>
</div> </div>
</header> </header>
@ -87,6 +86,7 @@
</div> </div>
</div> </div>
{{ end }} {{ end }}
<main> <main>
{{ template "content" .Data }} {{ template "content" .Data }}
</main> </main>

195
binary.go
View File

File diff suppressed because one or more lines are too long

59
fileinfo.go
View File

@ -3,7 +3,6 @@ package filemanager
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"mime"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -69,16 +68,12 @@ func GetFileInfo(url *url.URL, c *Config) (*FileInfo, int, error) {
// GetExtendedFileInfo is used to get extra parameters for FileInfo struct // GetExtendedFileInfo is used to get extra parameters for FileInfo struct
func (fi *FileInfo) GetExtendedFileInfo() error { func (fi *FileInfo) GetExtendedFileInfo() error {
fi.Mimetype = mime.TypeByExtension(filepath.Ext(fi.Path)) err := fi.Read()
fi.Type = SimplifyMimeType(fi.Mimetype) if err != nil {
return err
if fi.Type == "text" {
err := fi.Read()
if err != nil {
return err
}
} }
fi.Type = SimplifyMimeType(fi.Mimetype)
return nil return nil
} }
@ -88,6 +83,7 @@ func (fi *FileInfo) Read() error {
if err != nil { if err != nil {
return err return err
} }
fi.Mimetype = http.DetectContentType(raw)
fi.Content = string(raw) fi.Content = string(raw)
return nil return nil
} }
@ -104,7 +100,7 @@ func (fi FileInfo) HumanModTime(format string) string {
} }
// Delete handles the delete requests // Delete handles the delete requests
func (fi FileInfo) Delete() (int, error) { func (fi *FileInfo) Delete() (int, error) {
var err error var err error
// If it's a directory remove all the contents inside // If it's a directory remove all the contents inside
@ -122,7 +118,7 @@ func (fi FileInfo) Delete() (int, error) {
} }
// Rename function is used tor rename a file or a directory // Rename function is used tor rename a file or a directory
func (fi FileInfo) Rename(w http.ResponseWriter, r *http.Request) (int, error) { func (fi *FileInfo) Rename(w http.ResponseWriter, r *http.Request) (int, error) {
newname := r.Header.Get("Rename-To") newname := r.Header.Get("Rename-To")
if newname == "" { if newname == "" {
return http.StatusBadRequest, nil return http.StatusBadRequest, nil
@ -135,11 +131,12 @@ func (fi FileInfo) Rename(w http.ResponseWriter, r *http.Request) (int, error) {
return ErrorToHTTPCode(err), err return ErrorToHTTPCode(err), err
} }
fi.Path = newpath
return http.StatusOK, nil return http.StatusOK, nil
} }
// ServeAsHTML is used to serve single file pages // ServeAsHTML is used to serve single file pages
func (fi FileInfo) ServeAsHTML(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { func (fi *FileInfo) ServeAsHTML(w http.ResponseWriter, r *http.Request, c *Config) (int, error) {
if fi.IsDir { if fi.IsDir {
return fi.serveListing(w, r, c) return fi.serveListing(w, r, c)
} }
@ -147,12 +144,16 @@ func (fi FileInfo) ServeAsHTML(w http.ResponseWriter, r *http.Request, c *Config
return fi.serveSingleFile(w, r, c) return fi.serveSingleFile(w, r, c)
} }
func (fi FileInfo) serveSingleFile(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { func (fi *FileInfo) serveSingleFile(w http.ResponseWriter, r *http.Request, c *Config) (int, error) {
err := fi.GetExtendedFileInfo() err := fi.GetExtendedFileInfo()
if err != nil { if err != nil {
return ErrorToHTTPCode(err), err return ErrorToHTTPCode(err), err
} }
if fi.Type == "blob" {
return fi.ServeRawFile(w, r, c)
}
page := &Page{ page := &Page{
Info: &PageInfo{ Info: &PageInfo{
Name: fi.Name, Name: fi.Name,
@ -163,18 +164,10 @@ func (fi FileInfo) serveSingleFile(w http.ResponseWriter, r *http.Request, c *Co
}, },
} }
templates := []string{"single", "actions", "base"} return page.PrintAsHTML(w, "single")
for _, t := range templates {
code, err := page.AddTemplate(t, Asset, nil)
if err != nil {
return code, err
}
}
return page.PrintAsHTML(w)
} }
func (fi FileInfo) serveListing(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { func (fi *FileInfo) serveListing(w http.ResponseWriter, r *http.Request, c *Config) (int, error) {
var err error var err error
file, err := c.Root.Open(fi.RootPath) file, err := c.Root.Open(fi.RootPath)
@ -226,15 +219,7 @@ func (fi FileInfo) serveListing(w http.ResponseWriter, r *http.Request, c *Confi
}, },
} }
templates := []string{"listing", "actions", "base"} return page.PrintAsHTML(w, "listing")
for _, t := range templates {
code, err := page.AddTemplate(t, Asset, nil)
if err != nil {
return code, err
}
}
return page.PrintAsHTML(w)
} }
func (fi FileInfo) loadDirectoryContents(file http.File, c *Config) (*Listing, error) { func (fi FileInfo) loadDirectoryContents(file http.File, c *Config) (*Listing, error) {
@ -314,5 +299,13 @@ func SimplifyMimeType(name string) string {
return "image" return "image"
} }
return "text" if strings.HasPrefix(name, "text") {
return "text"
}
if strings.HasPrefix(name, "application/javascript") {
return "text"
}
return "blob"
} }

2
filemanager.go
View File

@ -1,6 +1,6 @@
//go:generate go get github.com/jteeuwen/go-bindata //go:generate go get github.com/jteeuwen/go-bindata
//go:generate go install github.com/jteeuwen/go-bindata/go-bindata //go:generate go install github.com/jteeuwen/go-bindata/go-bindata
//go:generate go-bindata -pkg filemanager -prefix "assets" -o binary.go assets/... //go:generate go-bindata -debug -pkg filemanager -prefix "assets" -o binary.go assets/...
// Package filemanager provides middleware for managing files in a directory // Package filemanager provides middleware for managing files in a directory
// when directory path is requested instead of a specific file. Based on browse // when directory path is requested instead of a specific file. Based on browse

60
page.go
View File

@ -12,7 +12,6 @@ import (
// Page contains the informations and functions needed to show the page // Page contains the informations and functions needed to show the page
type Page struct { type Page struct {
Info *PageInfo Info *PageInfo
Tpl *template.Template
} }
// AssetFunc is an Assets function // AssetFunc is an Assets function
@ -72,37 +71,38 @@ func (p PageInfo) PreviousLink() string {
return parts[len(parts)-2] return parts[len(parts)-2]
} }
// AddTemplate adds a template file to the page template
func (p *Page) AddTemplate(name string, assets AssetFunc, functions template.FuncMap) (int, error) {
// Get the template from the assets
page, err := assets("templates/" + name + ".tmpl")
// Check if there is some error. If so, the template doesn't exist
if err != nil {
log.Print(err)
return http.StatusInternalServerError, err
}
// If it's the first iteration, creates a new template and add the
// functions map
if p.Tpl == nil {
p.Tpl, err = template.New(name).Funcs(functions).Parse(string(page))
} else {
p.Tpl, err = p.Tpl.Parse(string(page))
}
if err != nil {
log.Print(err)
return http.StatusInternalServerError, err
}
return 0, nil
}
// PrintAsHTML formats the page in HTML and executes the template // PrintAsHTML formats the page in HTML and executes the template
func (p Page) PrintAsHTML(w http.ResponseWriter) (int, error) { func (p Page) PrintAsHTML(w http.ResponseWriter, templates ...string) (int, error) {
templates = append(templates, "actions", "base")
var tpl *template.Template
// For each template, add it to the the tpl variable
for i, t := range templates {
// Get the template from the assets
page, err := Asset("templates/" + t + ".tmpl")
// Check if there is some error. If so, the template doesn't exist
if err != nil {
log.Print(err)
return http.StatusInternalServerError, err
}
// If it's the first iteration, creates a new template and add the
// functions map
if i == 0 {
tpl, err = template.New(t).Parse(string(page))
} else {
tpl, err = tpl.Parse(string(page))
}
if err != nil {
log.Print(err)
return http.StatusInternalServerError, err
}
}
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
err := p.Tpl.Execute(buf, p.Info) err := tpl.Execute(buf, p.Info)
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err