X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rrequests.py;h=f0d04dae377cd16f0d1e4194e0a43b8a190168fc;hb=00ddc855d130a8ce37f1efcd00ca225b656fbfce;hp=d1bf98bfca2e9b5c758cbf762d51697922f614c6;hpb=08ec9479b05db7a2d40cc58f3a39256dfaf9ff30;p=bookmarks_db.git

diff --git a/Robots/bkmk_rrequests.py b/Robots/bkmk_rrequests.py
index d1bf98b..f0d04da 100644
--- a/Robots/bkmk_rrequests.py
+++ b/Robots/bkmk_rrequests.py
@@ -11,27 +11,77 @@ __license__ = "GNU GPL"
 __all__ = ['robot_requests']
 
 
+from urllib.parse import urlsplit
+
 import requests
 import requests_ftp
 
-from Robots.bkmk_robot_base import robot_base
+from Robots.bkmk_robot_base import robot_base, request_headers
 
 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
+
+    # Store hosts for which we already know they require proxy...
+    proxy_ok = set()
+    # ...but aren't accessible even through proxy
+    proxy_error = set()
+
     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)
-            self.log('   Error: %s' % error)
-            return error, None, None, None, None
+        split_results = urlsplit(url)
+        url_host = split_results.hostname
+
+        if url_host in self.proxy_error:
+            return 'see prev. error', None, None, None, None
+
+        if accept_charset and bookmark.charset:
+            headers = request_headers.copy()
+            headers['Accept-Charset'] = bookmark.charset
         else:
-            if r.is_redirect:
-                return None, r.status_code, r.next.url, None, None
-            return None, None, None, r.headers, r.content
+            headers = request_headers
+
+        if url_host in self.proxy_ok:
+            self.log('   Immediately trying with the proxy')
+            error, r = request_get(url, headers, self.timeout, self.proxy)
+        else:
+            error, r = request_get(url, headers, 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, headers,
+                                           self.timeout, self.proxy)
+                    if error is None:
+                        self.proxy_ok.add(url_host)
+        if error is not None:
+            if self.proxy:
+                self.log('   Proxy error: %s' % error)
+                if url_host not in self.proxy_ok:
+                    self.proxy_error.add(url_host)
+            return error, None, None, None, None
+        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, headers, timeout, proxy):
+    if proxy:
+        proxies = {'http': proxy, 'https': proxy}
+    else:
+        proxies = None
+
+    try:
+        r = requests.Session().get(
+            url, headers=headers, timeout=timeout,
+            allow_redirects=False, proxies=proxies)
+    except requests.RequestException as e:
+        return str(e), None
+    else:
+        return None, r