From f26b9777839e3490f7786f00c366bb01c5cb2fa1 Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Fri, 4 Dec 2020 19:20:06 +0800 Subject: [PATCH] allow disabling file detections for paths --- files/file.go | 10 +++- .../settings/DisableTypeDetections.vue | 56 +++++++++++++++++++ frontend/src/components/settings/UserForm.vue | 8 +++ frontend/src/i18n/en.json | 2 + frontend/src/i18n/zh-cn.json | 4 +- http/data.go | 12 ++++ rules/rules.go | 1 + users/users.go | 34 ++++++----- 8 files changed, 109 insertions(+), 18 deletions(-) create mode 100644 frontend/src/components/settings/DisableTypeDetections.vue diff --git a/files/file.go b/files/file.go index d58b2a34..792805a0 100644 --- a/files/file.go +++ b/files/file.go @@ -261,9 +261,13 @@ func (i *FileInfo) readListing(checker rules.Checker) error { } else { listing.NumFiles++ - err := file.detectType(true, false) - if err != nil { - return err + if checker.IsTypeDetectDisabled(file.Path) { + file.Type = "blob" + } else { + err := file.detectType(true, false) + if err != nil { + return err + } } } diff --git a/frontend/src/components/settings/DisableTypeDetections.vue b/frontend/src/components/settings/DisableTypeDetections.vue new file mode 100644 index 00000000..c3bda8e2 --- /dev/null +++ b/frontend/src/components/settings/DisableTypeDetections.vue @@ -0,0 +1,56 @@ + + + diff --git a/frontend/src/components/settings/UserForm.vue b/frontend/src/components/settings/UserForm.vue index d56f1f77..473f7be8 100644 --- a/frontend/src/components/settings/UserForm.vue +++ b/frontend/src/components/settings/UserForm.vue @@ -36,12 +36,19 @@

{{ $t('settings.rulesHelp') }}

+ +
+

{{ $t('settings.disableTypeDetections') }}

+

{{ $t('settings.disableTypeDetectionsHelp') }}

+ +