From 85769b309e2f54f89d77571009e32d5967409bb0 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 4 Jan 2019 09:07:53 +0000 Subject: [PATCH] feat: some more cleaning License: MIT Signed-off-by: Henrique Dias --- http/resource.go | 5 ----- lib/filebrowser.go | 4 ++++ search/search.go | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/http/resource.go b/http/resource.go index 778924c7..a9f146ab 100644 --- a/http/resource.go +++ b/http/resource.go @@ -64,11 +64,6 @@ func (e *env) resourceGetHandler(w http.ResponseWriter, r *http.Request) { return } - if !user.Perm.Modify && file.Type == "text" { - // TODO: move to detet file type - file.Type = "textImmutable" - } - if checksum := r.URL.Query().Get("checksum"); checksum != "" { err = e.Checksum(file,user, checksum) if err == lib.ErrInvalidOption { diff --git a/lib/filebrowser.go b/lib/filebrowser.go index 38fff549..a9f7e69e 100644 --- a/lib/filebrowser.go +++ b/lib/filebrowser.go @@ -350,6 +350,10 @@ func (f *FileBrowser) detectType(file *File, user *User) error { file.Content = string(content) } + if !user.Perm.Modify && file.Type == "text" { + file.Type = "textImmutable" + } + return nil } diff --git a/search/search.go b/search/search.go index feb0f635..a035fddc 100644 --- a/search/search.go +++ b/search/search.go @@ -13,8 +13,7 @@ type searchOptions struct { Terms []string } -// TODO: create filtering afero backend -// used filepath.SkipDir to skip +// TODO: move to FIle Browser and also check for IsAllowed // Search searches for a query in a fs. func Search(fs afero.Fs, scope string, query string, found func(path string, f os.FileInfo) error) error {