Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search with working regex. #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Search with working regex. #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff7248d
added working search modifications to handle regex
icsy7867 Jan 6, 2023
fe6007e
removed console.log
icsy7867 Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions src/views/Search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,48 @@ export default {
// Setup fuse
let fuseOptions = {
// shouldSort: true,//TODO
threshold: 0.3,
threshold: 1.0,
keys: keys
}

let loopFunction = () => {
DatabaseService().getAllItems({ skip: i, limit: RECORD_TO_PULL }).then((data) => {
// Modify with regex
query = this.$route.query.query
if (query) {
let re = RegExp()
if (query.includes(':')) {
// param = query.split(':')[1].toLowerCase()
re = new RegExp(query.split(':')[1].toLowerCase())
} else {
re = new RegExp(query.toLowerCase())
}
if (query.startsWith('name:')) {
data.rows = data.rows.filter(row => !!row.name && re.test(row.name.toLowerCase()))
} else if (query.startsWith('manufacturer:')) {
data.rows = data.rows.filter(row => !!row.manufacturer && re.test(row.manufacturer.toLowerCase()))
} else if (query.startsWith('acquiredfrom:')) {
data.rows = data.rows.filter(row => !!row.acquiredFrom && re.test(row.acquiredFrom.toLowerCase()))
} else if (query.startsWith('warranty:')) {
data.rows = data.rows.filter(row => !!row.warranty && re.test(row.warranty.toLowerCase()))
} else if (query.startsWith('location:')) {
data.rows = data.rows.filter(row => !!row.location && re.test(row.location.toLowerCase()))
} else if (query.startsWith('pricepaid:')) {
data.rows = data.rows.filter(row => !!row.pricePaid && re.test(row.pricePaid.toLowerCase()))
} else if (query.startsWith('tags:')) {
data.rows = data.rows.filter(row => !!row.tags && re.test(row.tags.toString().toLowerCase()))
} else if (query.startsWith('weight:')) {
data.rows = data.rows.filter(row => !!row.weight && re.test(row.weight.toLowerCase()))
} else {
data.rows = data.rows.filter(row => re.test(row.name.toLowerCase()))
}
data.total_rows = data.rows.length
}
// end regex mods

i += data.rows.length || 10// If no items are returned the database only has config. We need to add some manually so we dont loop forever

results = results.concat((new Fuse(data.rows, fuseOptions)).search(query))
results = results.concat((new Fuse(data.rows, fuseOptions).search(' ')))

let resultsToSkip = skipResults - resultsSkipped
if (resultsToSkip > 0) {
Expand Down