Refactor(Rebobt/requests)

[bookmarks_db.git] / Robots / bkmk_rrequests.py

diff --git a/Robots/bkmk_rrequests.py b/Robots/bkmk_rrequests.py
index d1bf98bfca2e9b5c758cbf762d51697922f614c6..e1f00198dcda56a7f4d54835ce322d29ba51bc69 100644 (file)
--- a/Robots/bkmk_rrequests.py
+++ b/Robots/bkmk_rrequests.py
@@ -20,18 +20,39 @@ requests_ftp.monkeypatch_session()
 
 
 class robot_requests(robot_base):
+    # Pass proxy from the environment like this:
+    # BKMK_ROBOT=requests:proxy=socks5h%3a//localhost%3a1080
+    proxy = None
+
     def get(self, bookmark, url, accept_charset=False):
-        try:
-            r = requests.Session().get(
-                url, timeout=self.timeout, allow_redirects=False)
-        except requests.RequestException as e:
-            error = str(e)
+        error, r = request_get(url, self.timeout, None)
+        if error is not None:
             self.log('   Error: %s' % error)
+            if self.proxy:
+                self.log('   Retrying with the proxy...')
+                error, r = request_get(url, self.timeout, self.proxy)
+        if error is not None:
+            if self.proxy:
+                self.log('   Proxy error: %s' % error)
             return error, None, None, None, None
-        else:
-            if r.is_redirect:
-                return None, r.status_code, r.next.url, None, None
-            return None, None, None, r.headers, r.content
+        if r.is_redirect:
+            return None, r.status_code, r.next.url, None, None
+        return None, None, None, r.headers, r.content
 
     def get_ftp_welcome(self):
         return ''  # Alas, requests_ftp doesn't store welcome message
+
+
+def request_get(url, timeout, proxy):
+    if proxy:
+        proxies = {'http': proxy, 'https': proxy}
+    else:
+        proxies = None
+
+    try:
+        r = requests.Session().get(
+            url, timeout=timeout, allow_redirects=False, proxies=proxies)
+    except requests.RequestException as e:
+        return str(e), None
+    else:
+        return None, r