From afc84de234787a867ae36d0db9abb0a555cda1aa Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Mon, 12 Sep 2022 16:48:58 +0300 Subject: [PATCH] Make word filter regex explicit. Allow hyphen in word filters Helps with #88 --- src/search_filter/word_filter.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/search_filter/word_filter.py b/src/search_filter/word_filter.py index dd376cbb..e040ceee 100644 --- a/src/search_filter/word_filter.py +++ b/src/search_filter/word_filter.py @@ -1,14 +1,12 @@ # Standard Packages import re import time -import pickle import logging from collections import defaultdict # Internal Packages from src.search_filter.base_filter import BaseFilter -from src.utils.helpers import LRU, resolve_absolute_path -from src.utils.config import SearchType +from src.utils.helpers import LRU logger = logging.getLogger(__name__) @@ -16,8 +14,8 @@ logger = logging.getLogger(__name__) class WordFilter(BaseFilter): # Filter Regex - required_regex = r'\+"(\w+)" ?' - blocked_regex = r'\-"(\w+)" ?' + required_regex = r'\+"([a-zA-Z0-9_-]+)" ?' + blocked_regex = r'\-"([a-zA-Z0-9_-]+)" ?' def __init__(self, entry_key='raw'): self.entry_key = entry_key