From dc50793d2d27413deeb043f7409640aaf0d8fbe0 Mon Sep 17 00:00:00 2001 From: Daniel Dimijian Date: Wed, 2 Mar 2022 01:20:21 -0500 Subject: fix ripbang userscript for command line (not spawned) --- misc/userscripts/ripbang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index df9cb2fbc..bc9e48df3 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -20,7 +20,8 @@ except ImportError: for argument in sys.argv[1:]: bang = '!' + argument r = requests.get('https://duckduckgo.com/', - params={'q': bang + ' SEARCHTEXT'}) + params={'q': bang + ' SEARCHTEXT'}, + headers={'user-agent': 'test/0.0.1'}) searchengine = unquote(re.search("url=[^']+", r.text).group(0)) searchengine = searchengine.replace('url=', '') -- cgit v1.2.3-54-g00ecf From b5c1cf91447c9d4bb7e4858bc92870c83f841837 Mon Sep 17 00:00:00 2001 From: Daniel Dimijian Date: Wed, 2 Mar 2022 01:49:17 -0500 Subject: fix ripbang url snipping and set command --- misc/userscripts/ripbang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index bc9e48df3..66abc0481 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -25,11 +25,12 @@ for argument in sys.argv[1:]: searchengine = unquote(re.search("url=[^']+", r.text).group(0)) searchengine = searchengine.replace('url=', '') - searchengine = searchengine.replace('/l/?kh=-1&uddg=', '') + searchengine = searchengine.replace('/l/?uddg=', '') searchengine = searchengine.replace('SEARCHTEXT', '{}') + searchengine = searchengine[0:searchengine.find("&rut")] if os.getenv('QUTE_FIFO'): with open(os.environ['QUTE_FIFO'], 'w') as fifo: - fifo.write('set searchengines %s %s' % (bang, searchengine)) + fifo.write('config-dict-add url.searchengines %s %s' % (bang, searchengine)) else: print('%s %s' % (bang, searchengine)) -- cgit v1.2.3-54-g00ecf From ed61390bde406feeaeac8260227beda691c45f05 Mon Sep 17 00:00:00 2001 From: Daniel Dimijian Date: Wed, 2 Mar 2022 02:24:22 -0500 Subject: change user agent to ripbang --- misc/userscripts/ripbang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index 66abc0481..517b9fa6f 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -21,7 +21,7 @@ for argument in sys.argv[1:]: bang = '!' + argument r = requests.get('https://duckduckgo.com/', params={'q': bang + ' SEARCHTEXT'}, - headers={'user-agent': 'test/0.0.1'}) + headers={'user-agent': 'ripbang'}) searchengine = unquote(re.search("url=[^']+", r.text).group(0)) searchengine = searchengine.replace('url=', '') -- cgit v1.2.3-54-g00ecf From b6c658a9585c171ffe3f422861baf3815ce246be Mon Sep 17 00:00:00 2001 From: Jetfrog28 Date: Wed, 2 Mar 2022 03:35:32 -0500 Subject: include qutebrowser in user agent Co-authored-by: Florian Bruhin --- misc/userscripts/ripbang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index 517b9fa6f..e3a504e3c 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -21,7 +21,7 @@ for argument in sys.argv[1:]: bang = '!' + argument r = requests.get('https://duckduckgo.com/', params={'q': bang + ' SEARCHTEXT'}, - headers={'user-agent': 'ripbang'}) + headers={'user-agent': 'qutebrowser ripbang'}) searchengine = unquote(re.search("url=[^']+", r.text).group(0)) searchengine = searchengine.replace('url=', '') -- cgit v1.2.3-54-g00ecf From 5eb57f43547969a44a38f541de003ece20bb6111 Mon Sep 17 00:00:00 2001 From: Daniel Dimijian Date: Wed, 2 Mar 2022 10:58:03 -0500 Subject: remove python 2 compatibility imports --- misc/userscripts/ripbang | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index e3a504e3c..ec2b871ca 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -9,13 +9,8 @@ # :spawn --userscript ripbang amazon maps # -from __future__ import print_function import os, re, requests, sys - -try: - from urllib.parse import unquote -except ImportError: - from urllib import unquote +from urllib.parse import urlparse, parse_qs for argument in sys.argv[1:]: bang = '!' + argument -- cgit v1.2.3-54-g00ecf From 68f683a8ad1c3aad7b2697bfd25eda90bca9adac Mon Sep 17 00:00:00 2001 From: Daniel Dimijian Date: Wed, 2 Mar 2022 10:59:30 -0500 Subject: make url grabbing more robust --- misc/userscripts/ripbang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/misc/userscripts/ripbang b/misc/userscripts/ripbang index ec2b871ca..2f867c838 100755 --- a/misc/userscripts/ripbang +++ b/misc/userscripts/ripbang @@ -18,11 +18,10 @@ for argument in sys.argv[1:]: params={'q': bang + ' SEARCHTEXT'}, headers={'user-agent': 'qutebrowser ripbang'}) - searchengine = unquote(re.search("url=[^']+", r.text).group(0)) - searchengine = searchengine.replace('url=', '') - searchengine = searchengine.replace('/l/?uddg=', '') + searchengine = re.search("url=([^']+)", r.text).group(1) + searchengine = urlparse(searchengine).query + searchengine = parse_qs(searchengine)['uddg'][0] searchengine = searchengine.replace('SEARCHTEXT', '{}') - searchengine = searchengine[0:searchengine.find("&rut")] if os.getenv('QUTE_FIFO'): with open(os.environ['QUTE_FIFO'], 'w') as fifo: -- cgit v1.2.3-54-g00ecf