github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix previous link; add more stuff

pull/144/head
Henrique Dias 2016-06-26 16:52:15 +01:00
parent ae6700709d
commit fff716b2b3
7 changed files with 150 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/public/css/styles.css
View File

@ -328,7 +328,7 @@ header p i {
header #logout { header #logout {
background-color: rgba(0,0,0,0.1); background-color: rgba(0,0,0,0.1);
border-radius: 0; border-radius: 0;
margin: -0.5em; margin: -0.5em -0.5em -0.5em 0;
padding: .5em; padding: .5em;
} }
header p i { header p i {

93
assets/templates/base.tmpl
View File

@ -18,59 +18,61 @@
{{ end }} {{ end }}
</head> </head>
<body> <body>
<header> <header>
<div> <div>
{{ $lnk := .PreviousLink }} {{ $lnk := .PreviousLink }}
{{ if ne $lnk ""}} {{ if ne $lnk ""}}
<a href="{{ if eq $lnk " /" }}/{{else }}../../{{.PreviousLink}}{{ end }}"> <a href="{{ $lnk }}">
<div class="action" id="prev"> <div class="action" id="prev">
<i class="material-icons">subdirectory_arrow_left</i> <i class="material-icons">subdirectory_arrow_left</i>
</div> </div>
</a>{{ else }} </a>
<div class="action disabled" id="prev"> {{ else }}
<i class="material-icons">subdirectory_arrow_left</i> <div class="action disabled" id="prev">
</div> <i class="material-icons">subdirectory_arrow_left</i>
{{ end }} </div>
<p> {{ end }}
<a href="{{ if eq .Config.BaseURL " " }}/{{ else }}{{ .Config.BaseURL }}{{ end }}"> <p>
{{ if .Config.HugoEnabled }}Hugo{{ else }}File Manager{{ end }} <a href="{{ if eq .Config.BaseURL " " }}/{{ else }}{{ .Config.BaseURL }}{{ end }}">
</a> {{ if .Config.HugoEnabled }}Hugo{{ else }}File Manager{{ end }}
{{ if ne .Name "/"}} </a>
<i class="material-icons">chevron_right</i> {{ if ne .Name "/"}}
{{ .Name }}</p> <i class="material-icons">chevron_right</i>
{{ end }} {{ .Name }}</p>
</div> {{ end }}
<div> </div>
<div>
{{ if .IsDir}} {{ if .IsDir}}
<!-- <form> <form>
<i class="material-icons">search</i> <i class="material-icons">search</i>
<input type="text" placeholder="Search"> <input type="text" placeholder="Search">
</form> --> </form>
<div class="action" id="view"> <div class="action" id="view">
<i class="material-icons">view_headline</i> <i class="material-icons">view_headline</i>
</div> </div>
<div class="action" id="upload"> <div class="action" id="upload">
<i class="material-icons">file_upload</i> <i class="material-icons">file_upload</i>
</div> </div>
{{ else }} {{ else }}
{{ template "actions" . }} {{ template "actions" . }}
{{ end }} {{ end }}
{{ if .Config.HugoEnabled }} {{ if .Config.HugoEnabled }}
<!-- Hugo plugin stuff --> <!-- Hugo plugin stuff -->
<a href="{{ .Config.BaseURL }}/settings"> <a href="{{ .Config.BaseURL }}/settings">
<div class="action"> <div class="action">
<i class="material-icons">settings</i> <i class="material-icons">settings</i>
</div> </div>
</a> </a>
{{ end }} {{ end }}
<div class="action" id="logout"> <div class="action" id="logout">
<i class="material-icons">exit_to_app</i> <i class="material-icons">exit_to_app</i>
</div> </div>
</div> </div>
</header> </header>
{{ if .IsDir }} {{ if .IsDir }}
<div id="toolbar"> <div id="toolbar">
@ -89,6 +91,7 @@
{{ end }} {{ end }}
<main> <main>
{{ .Path }}
{{ template "content" .Data }} {{ template "content" .Data }}
</main> </main>
<footer> <footer>

91
filemanager.go
View File

@ -8,12 +8,7 @@
package filemanager package filemanager
import ( import (
"io"
"log"
"mime/multipart"
"net/http" "net/http"
"os"
"path/filepath"
"strings" "strings"
a "github.com/hacdias/caddy-filemanager/internal/assets" a "github.com/hacdias/caddy-filemanager/internal/assets"
@ -80,9 +75,15 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
case http.MethodPost: case http.MethodPost:
// Upload a new file // Upload a new file
if r.Header.Get("Upload") == "true" { if r.Header.Get("Upload") == "true" {
return Upload(w, r, c) return file.Upload(w, r, c)
} }
return NewFolder(w, r, c) // Search and git commands
if r.Header.Get("Search") == "true" {
// TODO: search and git commands
}
// Creates a new folder
// TODO: not implemented on frontend
return file.NewDir(w, r, c)
case http.MethodDelete: case http.MethodDelete:
// Delete a file or a directory // Delete a file or a directory
return fi.Delete() return fi.Delete()
@ -97,79 +98,3 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
return f.Next.ServeHTTP(w, r) return f.Next.ServeHTTP(w, r)
} }
// ErrorToHTTPCode gets the respective HTTP code for an error
func ErrorToHTTPCode(err error) int {
switch {
case os.IsPermission(err):
return http.StatusForbidden
case os.IsNotExist(err):
return http.StatusNotFound
case os.IsExist(err):
return http.StatusGone
default:
return http.StatusInternalServerError
}
}
// Upload is used to handle the upload requests to the server
func Upload(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
// Parse the multipart form in the request
err := r.ParseMultipartForm(100000)
if err != nil {
log.Println(err)
return http.StatusInternalServerError, err
}
// For each file header in the multipart form
for _, headers := range r.MultipartForm.File {
// Handle each file
for _, header := range headers {
// Open the first file
var src multipart.File
if src, err = header.Open(); nil != err {
return http.StatusInternalServerError, err
}
filename := strings.Replace(r.URL.Path, c.BaseURL, c.PathScope, 1)
filename = filename + header.Filename
filename = filepath.Clean(filename)
// Create the file
var dst *os.File
if dst, err = os.Create(filename); nil != err {
if os.IsExist(err) {
return http.StatusConflict, err
}
return http.StatusInternalServerError, err
}
// Copy the file content
if _, err = io.Copy(dst, src); nil != err {
return http.StatusInternalServerError, err
}
defer dst.Close()
}
}
return http.StatusOK, nil
}
// NewFolder makes a new directory
func NewFolder(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
path := strings.Replace(r.URL.Path, c.BaseURL, c.PathScope, 1)
path = filepath.Clean(path)
err := os.MkdirAll(path, 0755)
if err != nil {
switch {
case os.IsPermission(err):
return http.StatusForbidden, err
case os.IsExist(err):
return http.StatusConflict, err
default:
return http.StatusInternalServerError, err
}
}
return http.StatusCreated, nil
}

28
internal/file/dir.go Normal file
View File

@ -0,0 +1,28 @@
package file
import (
"net/http"
"os"
"path/filepath"
"strings"
"github.com/hacdias/caddy-filemanager/internal/config"
)
// NewDir makes a new directory
func NewDir(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
path := strings.Replace(r.URL.Path, c.BaseURL, c.PathScope, 1)
path = filepath.Clean(path)
err := os.MkdirAll(path, 0755)
if err != nil {
switch {
case os.IsPermission(err):
return http.StatusForbidden, err
case os.IsExist(err):
return http.StatusConflict, err
default:
return http.StatusInternalServerError, err
}
}
return http.StatusCreated, nil
}

57
internal/file/upload.go Normal file
View File

@ -0,0 +1,57 @@
package file
import (
"io"
"log"
"mime/multipart"
"net/http"
"os"
"path/filepath"
"strings"
"github.com/hacdias/caddy-filemanager/internal/config"
)
// Upload is used to handle the upload requests to the server
func Upload(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
// Parse the multipart form in the request
err := r.ParseMultipartForm(100000)
if err != nil {
log.Println(err)
return http.StatusInternalServerError, err
}
// For each file header in the multipart form
for _, headers := range r.MultipartForm.File {
// Handle each file
for _, header := range headers {
// Open the first file
var src multipart.File
if src, err = header.Open(); nil != err {
return http.StatusInternalServerError, err
}
filename := strings.Replace(r.URL.Path, c.BaseURL, c.PathScope, 1)
filename = filename + header.Filename
filename = filepath.Clean(filename)
// Create the file
var dst *os.File
if dst, err = os.Create(filename); nil != err {
if os.IsExist(err) {
return http.StatusConflict, err
}
return http.StatusInternalServerError, err
}
// Copy the file content
if _, err = io.Copy(dst, src); nil != err {
return http.StatusInternalServerError, err
}
defer dst.Close()
}
}
return http.StatusOK, nil
}

17
internal/page/page.go
View File

@ -57,19 +57,16 @@ func (i Info) BreadcrumbMap() map[string]string {
// PreviousLink returns the path of the previous folder // PreviousLink returns the path of the previous folder
func (i Info) PreviousLink() string { func (i Info) PreviousLink() string {
parts := strings.Split(strings.TrimSuffix(i.Path, "/"), "/") path := strings.TrimSuffix(i.Path, "/")
if len(parts) <= 1 { path = strings.TrimPrefix(path, "/")
path = i.Config.BaseURL + "/" + path
path = path[0 : len(path)-len(i.Name)]
if len(path) < len(i.Config.BaseURL+"/") {
return "" return ""
} }
if parts[len(parts)-2] == "" { return path
if i.Config.BaseURL == "" {
return "/"
}
return i.Config.BaseURL
}
return parts[len(parts)-2]
} }
// PrintAsHTML formats the page in HTML and executes the template // PrintAsHTML formats the page in HTML and executes the template

1
internal/search/search.go Normal file
View File

@ -0,0 +1 @@
package search