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

remove redundant check

Browse Source
This commit is contained in:
WeidiDeng 2020-12-05 19:14:26 +08:00
parent 01e3d9e11c
commit f7e4b26e39
No known key found for this signature in database
GPG Key ID: 25F87CE1741EC7CD
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/file.go
View File

@ -228,6 +228,7 @@ func (i *FileInfo) readListing(checker rules.Checker) error {
NumFiles: 0, NumFiles: 0,
} }
detectDisabled := checker.IsTypeDetectDisabled(i.Path)
for _, f := range dir { for _, f := range dir {
name := f.Name() name := f.Name()
fPath := path.Join(i.Path, name) fPath := path.Join(i.Path, name)
@ -261,7 +262,7 @@ func (i *FileInfo) readListing(checker rules.Checker) error {
} else { } else {
listing.NumFiles++ listing.NumFiles++
if checker.IsTypeDetectDisabled(file.Path) { if detectDisabled {
file.Type = "blob" file.Type = "blob"
} else { } else {
err := file.detectType(true, false) err := file.detectType(true, false)

3
http/data.go
View File

@ -48,7 +48,6 @@ func (d *data) Check(path string) bool {
} }
func (d *data) IsTypeDetectDisabled(path string) bool { func (d *data) IsTypeDetectDisabled(path string) bool {
if d.Check(path) {
for _, rule := range d.user.DisableTypeDetections { for _, rule := range d.user.DisableTypeDetections {
if rule.Matches(path) { if rule.Matches(path) {
return true return true
@ -56,8 +55,6 @@ func (d *data) IsTypeDetectDisabled(path string) bool {
} }
return false return false
} }
return false
}
func handle(fn handleFunc, prefix string, store *storage.Storage, server *settings.Server) http.Handler { func handle(fn handleFunc, prefix string, store *storage.Storage, server *settings.Server) http.Handler {
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {