df12ed6 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[mod] searx.RawTextQuery: the constructor call parse_query

df12ed6Alexandre Flament6 years ago

searx/query.py+2−1

compare with master

unifiedsplit

@@ -45,10 +45,11 @@ class RawTextQuery:

45 self.timeout_limit = None

46 self.external_bang = None

47 self.specific = False

48+ self._parse_query()

49 # parse query, if tags are set, which

50 # parse query, if tags are set, which

50 # change the search engine or search-language

51 # change the search engine or search-language

51− def parse_query(self):

52+ def _parse_query(self):

52 self.query_parts = []

53 self.query_parts = []

54 # split query, including whitespaces

55 # split query, including whitespaces

searx/search.py−1

@@ -266,7 +266,6 @@ def get_search_query_from_webapp(preferences, form):

266 # parse query, if tags are set, which change

267 # the serch engine or search-language

268 raw_text_query = RawTextQuery(form['q'], disabled_engines)

269− raw_text_query.parse_query()

270

269

271 # set query

270 # set query

272 query = raw_text_query.getSearchQuery()

271 query = raw_text_query.getSearchQuery()

searx/webapp.py−1

@@ -737,7 +737,6 @@ def autocompleter():

737

738 # parse query

739 raw_text_query = RawTextQuery(str(request.form.get('q', b'')), disabled_engines)

740− raw_text_query.parse_query()

741

740

742 # check if search query is set

741 # check if search query is set

743 if not raw_text_query.getSearchQuery():

742 if not raw_text_query.getSearchQuery():

tests/unit/test_query.py−9

@@ -7,7 +7,6 @@ class TestQuery(SearxTestCase):

7 def test_simple_query(self):

8 query_text = 'the query'

9 query = RawTextQuery(query_text, [])

10− query.parse_query()

12 self.assertEqual(query.getFullQuery(), query_text)

11 self.assertEqual(query.getFullQuery(), query_text)

13 self.assertEqual(len(query.query_parts), 1)

12 self.assertEqual(len(query.query_parts), 1)

@@ -19,7 +18,6 @@ class TestQuery(SearxTestCase):

19 query_text = 'the query'

18 query_text = 'the query'

20 full_query = ':' + language + ' ' + query_text

19 full_query = ':' + language + ' ' + query_text

21 query = RawTextQuery(full_query, [])

20 query = RawTextQuery(full_query, [])

22− query.parse_query()

24 self.assertEqual(query.getFullQuery(), full_query)

22 self.assertEqual(query.getFullQuery(), full_query)

25 self.assertEqual(len(query.query_parts), 3)

23 self.assertEqual(len(query.query_parts), 3)

@@ -32,7 +30,6 @@ class TestQuery(SearxTestCase):

32 query_text = 'the query'

30 query_text = 'the query'

33 full_query = ':' + language + ' ' + query_text

31 full_query = ':' + language + ' ' + query_text

34 query = RawTextQuery(full_query, [])

32 query = RawTextQuery(full_query, [])

35− query.parse_query()

37 self.assertEqual(query.getFullQuery(), full_query)

34 self.assertEqual(query.getFullQuery(), full_query)

38 self.assertEqual(len(query.query_parts), 3)

35 self.assertEqual(len(query.query_parts), 3)

@@ -44,7 +41,6 @@ class TestQuery(SearxTestCase):

44 query_text = 'the query'

41 query_text = 'the query'

45 full_query = ':' + language + ' ' + query_text

42 full_query = ':' + language + ' ' + query_text

46 query = RawTextQuery(full_query, [])

43 query = RawTextQuery(full_query, [])

47− query.parse_query()

49 self.assertEqual(query.getFullQuery(), full_query)

45 self.assertEqual(query.getFullQuery(), full_query)

50 self.assertEqual(len(query.query_parts), 3)

46 self.assertEqual(len(query.query_parts), 3)

@@ -56,7 +52,6 @@ class TestQuery(SearxTestCase):

56 query_text = 'the query'

52 query_text = 'the query'

57 full_query = ':' + language + ' ' + query_text

53 full_query = ':' + language + ' ' + query_text

58 query = RawTextQuery(full_query, [])

54 query = RawTextQuery(full_query, [])

59− query.parse_query()

61 self.assertEqual(query.getFullQuery(), full_query)

56 self.assertEqual(query.getFullQuery(), full_query)

62 self.assertEqual(len(query.query_parts), 1)

57 self.assertEqual(len(query.query_parts), 1)

@@ -66,7 +61,6 @@ class TestQuery(SearxTestCase):

66 def test_timeout_below100(self):

61 def test_timeout_below100(self):

67 query_text = '<3 the query'

62 query_text = '<3 the query'

68 query = RawTextQuery(query_text, [])

63 query = RawTextQuery(query_text, [])

69− query.parse_query()

71 self.assertEqual(query.getFullQuery(), query_text)

65 self.assertEqual(query.getFullQuery(), query_text)

72 self.assertEqual(len(query.query_parts), 3)

66 self.assertEqual(len(query.query_parts), 3)

@@ -76,7 +70,6 @@ class TestQuery(SearxTestCase):

76 def test_timeout_above100(self):

70 def test_timeout_above100(self):

77 query_text = '<350 the query'

71 query_text = '<350 the query'

78 query = RawTextQuery(query_text, [])

72 query = RawTextQuery(query_text, [])

79− query.parse_query()

81 self.assertEqual(query.getFullQuery(), query_text)

74 self.assertEqual(query.getFullQuery(), query_text)

82 self.assertEqual(len(query.query_parts), 3)

75 self.assertEqual(len(query.query_parts), 3)

@@ -86,7 +79,6 @@ class TestQuery(SearxTestCase):

86 def test_timeout_above1000(self):

79 def test_timeout_above1000(self):

87 query_text = '<3500 the query'

80 query_text = '<3500 the query'

88 query = RawTextQuery(query_text, [])

81 query = RawTextQuery(query_text, [])

89− query.parse_query()

91 self.assertEqual(query.getFullQuery(), query_text)

83 self.assertEqual(query.getFullQuery(), query_text)

92 self.assertEqual(len(query.query_parts), 3)

84 self.assertEqual(len(query.query_parts), 3)

@@ -97,7 +89,6 @@ class TestQuery(SearxTestCase):

97 # invalid number: it is not bang but it is part of the query

89 # invalid number: it is not bang but it is part of the query

98 query_text = '<xxx the query'

90 query_text = '<xxx the query'

99 query = RawTextQuery(query_text, [])

91 query = RawTextQuery(query_text, [])

100− query.parse_query()

101

102 self.assertEqual(query.getFullQuery(), query_text)

93 self.assertEqual(query.getFullQuery(), query_text)

103 self.assertEqual(len(query.query_parts), 1)

94 self.assertEqual(len(query.query_parts), 1)