From 959497e26be1ee9b514cd520e8002b378c735a1b Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 5 Sep 2016 21:50:06 +0200 Subject: [PATCH 1/8] [fix] remove trailing whitespaces --- searx/static/themes/oscar/less/logicodev/results.less | 4 ++-- searx/static/themes/oscar/less/pointhi/results.less | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/less/logicodev/results.less index 37a5a76..afa00cc 100644 --- a/searx/static/themes/oscar/less/logicodev/results.less +++ b/searx/static/themes/oscar/less/logicodev/results.less @@ -6,7 +6,7 @@ .favicon { margin-bottom:-3px; } - + a { color: @black; text-decoration: none; @@ -18,7 +18,7 @@ &:visited{ color: @violet; } - + .highlight { background-color: @dim-gray; // Chrome hack: bold is different size than normal diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/less/pointhi/results.less index b3d8700..fd012b2 100644 --- a/searx/static/themes/oscar/less/pointhi/results.less +++ b/searx/static/themes/oscar/less/pointhi/results.less @@ -6,10 +6,10 @@ .favicon { margin-bottom:-3px; } - + a { vertical-align: bottom; - + .highlight { font-weight:bold; } From 94b5f2ca7736d569a86196e57b75c2198a94acba Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 5 Sep 2016 21:57:49 +0200 Subject: [PATCH 2/8] [fix] result url wrap - closes #652 --- .../static/themes/oscar/css/logicodev.min.css | Bin 9846 -> 9893 bytes searx/static/themes/oscar/css/pointhi.min.css | Bin 6173 -> 6220 bytes .../themes/oscar/less/logicodev/results.less | 4 ++++ .../themes/oscar/less/pointhi/results.less | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 195385bbace91bab2668e0443c64fad74545d383..d6be657e63d05653d0ed3d23a5c4661a76c35b28 100644 GIT binary patch delta 58 zcmez7v($Hk8ozE)YH?{!iGp59YDI}|ZfQwsib8R2VopwVd45rfZh28+fmKpbYGSr7 Lh`(8dKS&$^q^1@V delta 12 TcmZ4L`^{&A8vo`{{s3_RBl-lG diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 389add2b9b672d875e0ac811c63f8a4da00978e0..adfb94170cd7beaac4cfffeb64b8e5b8dc567150 100644 GIT binary patch delta 58 zcmbPhaK>Q6Q+C~=)Z)^d5(T}I)QS?_+|rWN6oum4#GIV!^8BI{-SVQu0;{B=)WmFE L5P$Pyb}In@wIvq! delta 12 TcmX?OFxOziQ})dw92NoqBhmzY diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/less/logicodev/results.less index afa00cc..19ac55e 100644 --- a/searx/static/themes/oscar/less/logicodev/results.less +++ b/searx/static/themes/oscar/less/logicodev/results.less @@ -148,3 +148,7 @@ color: @gray; background: transparent; } + +.result .text-muted small { + word-wrap: break-word; +} diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/less/pointhi/results.less index fd012b2..fcb9b00 100644 --- a/searx/static/themes/oscar/less/pointhi/results.less +++ b/searx/static/themes/oscar/less/pointhi/results.less @@ -81,3 +81,7 @@ color: #AAA; background: #FFF; } + +.result .text-muted small { + word-wrap: break-word; +} From da4f1c25126ac15e38f428ed1469c4d1d9b149d3 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 5 Sep 2016 22:22:25 +0200 Subject: [PATCH 3/8] [mod] truncate result content in html - closes #224 --- searx/webapp.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index 800bde0..362f6e5 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -395,11 +395,9 @@ def index(): search.paging = True if search.request_data.get('format', 'html') == 'html': - if 'content' in result: - result['content'] = highlight_content(result['content'], - search.query.encode('utf-8')) # noqa - result['title'] = highlight_content(result['title'], - search.query.encode('utf-8')) + if 'content' in result and result['content']: + result['content'] = highlight_content(result['content'][:1024], search.query.encode('utf-8')) + result['title'] = highlight_content(result['title'], search.query.encode('utf-8')) else: if result.get('content'): result['content'] = html_to_text(result['content']).strip() @@ -559,7 +557,6 @@ def preferences(): lang = request.preferences.get_value('language') disabled_engines = request.preferences.engines.get_disabled() allowed_plugins = request.preferences.plugins.get_enabled() - results_on_new_tab = request.preferences.get_value('results_on_new_tab') # stats for preferences page stats = {} From b27f07af2366db61ad8754005f8138f980606196 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 5 Sep 2016 22:35:54 +0200 Subject: [PATCH 4/8] [enh] socks proxy support --- requirements.txt | 2 +- searx/settings.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0d2f61b..029c0cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ pygments==2.1.3 pyopenssl==0.15.1 python-dateutil==2.5.3 pyyaml==3.11 -requests==2.10.0 +requests[socks]==2.10.0 diff --git a/searx/settings.yml b/searx/settings.yml index 2c034a8..c0422d9 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -25,7 +25,7 @@ outgoing: # communication with search engines pool_maxsize : 10 # Number of simultaneous requests by host # uncomment below section if you want to use a proxy # see http://docs.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are not supported : see https://github.com/kennethreitz/requests/pull/478 +# SOCKS proxies are also supported: see http://docs.python-requests.org/en/master/user/advanced/#socks # proxies : # http : http://127.0.0.1:8080 # https: http://127.0.0.1:8080 From fa5bc3a5632d38a99a48782dd8a012a200534bb9 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 5 Sep 2016 22:44:48 +0200 Subject: [PATCH 5/8] [fix] use threading to recover after incomplete request crashes - closes #651 #662 --- searx/webapp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/searx/webapp.py b/searx/webapp.py index 362f6e5..f76281a 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -729,7 +729,8 @@ def run(): debug=settings['general']['debug'], use_debugger=settings['general']['debug'], port=settings['server']['port'], - host=settings['server']['bind_address'] + host=settings['server']['bind_address'], + threaded=True ) From 3a1b6fa818ce2cc5ec577cb88dae4616362e545e Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 6 Sep 2016 00:15:29 +0200 Subject: [PATCH 6/8] [fix] replace modal-content class to prevent remote content load details: http://stackoverflow.com/questions/18378720/bootstrap-3-with-remote-modal --- .../static/themes/oscar/css/logicodev.min.css | Bin 9893 -> 10129 bytes searx/static/themes/oscar/css/pointhi.min.css | Bin 6220 -> 6456 bytes .../themes/oscar/less/logicodev/results.less | 14 ++++++++++++++ .../themes/oscar/less/pointhi/results.less | 14 ++++++++++++++ .../oscar/result_templates/images.html | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index d6be657e63d05653d0ed3d23a5c4661a76c35b28..bd3d193ae5808aebc0be88e22a5715521865d723 100644 GIT binary patch delta 238 zcmZXOJqp4=6oikEO6(-10XHN{1UH?%SXo-UWY_p`-M4HK6OiB;#533n-cQ_g{xC4b zzW{V8Q(WFFDpl=NFjW2;vmh)g0##Ez^39G(>dp(e(iGGzxI@xTA`M1pC&C+ bLlxFYnp>$vjVIZMsQ2VZ{`0gPSMSxoXP?KGCl;l diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/less/logicodev/results.less index 19ac55e..93218e3 100644 --- a/searx/static/themes/oscar/less/logicodev/results.less +++ b/searx/static/themes/oscar/less/logicodev/results.less @@ -152,3 +152,17 @@ .result .text-muted small { word-wrap: break-word; } + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +} diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/less/pointhi/results.less index fcb9b00..beea353 100644 --- a/searx/static/themes/oscar/less/pointhi/results.less +++ b/searx/static/themes/oscar/less/pointhi/results.less @@ -85,3 +85,17 @@ .result .text-muted small { word-wrap: break-word; } + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 2d94ea6..750f8ce 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -6,7 +6,7 @@