Skip to content

Allow wrapping search terms in quotes to do exact searches #131

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

Open
spenceshady wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow wrapping search terms in quotes to do exact searches #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,34 @@ def updateCard(id, changes):
cur.execute('UPDATE cards SET {} WHERE id = %s'.format(', '.join('{}=%s'.format(k) for k in changes)), list(changes.values()) + [id])

def search(query, series=None):
# Search terms wrapped in quotes "" will use equality instead of LIKE comparisons
queryExact = query.startswith('"') and query.endswith('"')
cur = db.cursor()
if series is None:
cur.execute("SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name LIKE %s",
["%" + query + "%"])
if queryExact:
cur.execute("SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name = %s",
[query[1:-1]])
else:
cur.execute("SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name LIKE %s",
["%" + query + "%"])
else:
cur.execute(
"SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name LIKE %s AND series LIKE %s",
["%" + query + "%", "%" + series + "%"])
seriesExact = series.startswith('"') and series.endswith('"')
if queryExact and seriesExact:
cur.execute(
"SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name = %s AND series = %s",
[query[1:-1], series[1:-1]])
elif queryExact:
cur.execute(
"SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name = %s AND series LIKE %s",
[query[1:-1], "%" + series + "%"])
elif seriesExact:
cur.execute(
"SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name LIKE %s AND series = %s",
["%" + query + "%", series[1:-1]])
else:
cur.execute(
"SELECT id, name, series, base_rarity FROM waifus WHERE can_lookup = 1 AND name LIKE %s AND series LIKE %s",
["%" + query + "%", "%" + series + "%"])
rows = cur.fetchall()
ret = []
for row in rows:
Expand Down