From f7e4b26e39ae4762225ee78401ebff25251a3374 Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Sat, 5 Dec 2020 19:14:26 +0800 Subject: [PATCH] remove redundant check --- files/file.go | 3 ++- http/data.go | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/files/file.go b/files/file.go index 792805a0..88d44536 100644 --- a/files/file.go +++ b/files/file.go @@ -228,6 +228,7 @@ func (i *FileInfo) readListing(checker rules.Checker) error { NumFiles: 0, } + detectDisabled := checker.IsTypeDetectDisabled(i.Path) for _, f := range dir { name := f.Name() fPath := path.Join(i.Path, name) @@ -261,7 +262,7 @@ func (i *FileInfo) readListing(checker rules.Checker) error { } else { listing.NumFiles++ - if checker.IsTypeDetectDisabled(file.Path) { + if detectDisabled { file.Type = "blob" } else { err := file.detectType(true, false) diff --git a/http/data.go b/http/data.go index e1cccb30..d419eed9 100644 --- a/http/data.go +++ b/http/data.go @@ -48,13 +48,10 @@ func (d *data) Check(path string) bool { } func (d *data) IsTypeDetectDisabled(path string) bool { - if d.Check(path) { - for _, rule := range d.user.DisableTypeDetections { - if rule.Matches(path) { - return true - } + for _, rule := range d.user.DisableTypeDetections { + if rule.Matches(path) { + return true } - return false } return false }