Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-01-18 17:21:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed type-is and keyword exclusion logic

Browse Source
This commit is contained in:
Bobby Wibowo 2020-05-03 04:51:22 +07:00
parent f189d86abc
commit 417adbde93
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/uploadController.js
View File

@ -1177,17 +1177,19 @@ self.list = async (req, res) => {
// Then, refine using type-is flags
this.andWhere(function () {
for (const type of filterObj.typeIs) {
const patterns = utils[`${type}Exts`].map(ext => `%${ext}`)
let func
let operator
if (filterObj.flags[`is${type}`] === true)
if (filterObj.flags[`is${type}`] === true) {
func = 'orWhere'
operator = 'like'
else if (filterObj.flags[`is${type}`] === false)
} else if (filterObj.flags[`is${type}`] === false) {
func = 'andWhere'
operator = 'not like'
}
if (operator)
for (const pattern of patterns)
this.orWhere('name', operator, pattern)
if (func)
for (const pattern of utils[`${type}Exts`].map(ext => `%${ext}`))
this[func]('name', operator, pattern)
}
})
@ -1202,7 +1204,7 @@ self.list = async (req, res) => {
this.andWhere(function () {
if (!filterObj.queries.exclude.text) return
for (const pattern of filterObj.queries.exclude.text)
this.orWhere('name', 'not like', pattern)
this.andWhere('name', 'not like', pattern)
})
}