Browse Source

Merge pull request #658 from dalf/fix-standalone-script

Fix standalone script
Markus Heiser 3 years ago
parent
commit
54bce130f9
2 changed files with 6 additions and 38 deletions
  1. 0 37
      searxng_extra/google_search.py
  2. 6 1
      searxng_extra/standalone_searx.py

+ 0 - 37
searxng_extra/google_search.py

@@ -1,37 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from sys import argv, exit
-
-if not len(argv) > 1:
-    print('search query required')
-    exit(1)
-
-import requests
-from json import dumps
-from searx.engines import google
-from searx.search import default_request_params
-
-request_params = default_request_params()
-# Possible params
-# request_params['headers']['User-Agent'] = ''
-# request_params['category'] = ''
-request_params['pageno'] = 1
-request_params['language'] = 'en_us'
-request_params['time_range'] = ''
-
-params = google.request(argv[1], request_params)
-
-request_args = dict(
-    headers=request_params['headers'],
-    cookies=request_params['cookies'],
-)
-
-if request_params['method'] == 'GET':
-    req = requests.get
-else:
-    req = requests.post
-    request_args['data'] = request_params['data']
-
-resp = req(request_params['url'], **request_args)
-resp.search_params = request_params
-print(dumps(google.response(resp)))

+ 6 - 1
searxng_extra/standalone_searx.py

@@ -196,9 +196,14 @@ def parse_argument(
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    searx.search.initialize()
+    settings_engines = searx.settings['engines']
+    searx.search.load_engines(settings_engines)
     engine_cs = list(searx.engines.categories.keys())
     engine_cs = list(searx.engines.categories.keys())
     prog_args = parse_argument(category_choices=engine_cs)
     prog_args = parse_argument(category_choices=engine_cs)
+    searx.search.initialize_network(settings_engines, searx.settings['outgoing'])
+    searx.search.check_network_configuration()
+    searx.search.initialize_metrics([engine['name'] for engine in settings_engines])
+    searx.search.initialize_processors(settings_engines)
     search_q = get_search_query(prog_args, engine_categories=engine_cs)
     search_q = get_search_query(prog_args, engine_categories=engine_cs)
     res_dict = to_dict(search_q)
     res_dict = to_dict(search_q)
     sys.stdout.write(dumps(
     sys.stdout.write(dumps(