From 36359b1547f5d3d94fc46e187310ad59dc1629f9 Mon Sep 17 00:00:00 2001 From: Peter Maciocia Date: Tue, 6 May 2014 11:25:30 +0100 Subject: [PATCH 1/2] Fix for #390, add flag to use proxy settings --- sickbeard/helpers.py | 8 +++++--- sickbeard/providers/generic.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index b6b02f7e..b8e47315 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -165,7 +165,7 @@ def sanitizeFileName(name): return name -def getURL(url, post_data=None, headers=None, params=None, timeout=30, json=False): +def getURL(url, post_data=None, headers=None, params=None, timeout=30, json=False, use_proxy=False): """ Returns a byte-string retrieved from the url provider. """ @@ -186,8 +186,10 @@ def getURL(url, post_data=None, headers=None, params=None, timeout=30, json=Fals url = urlparse.urlunparse(parsed) it = iter(req_headers) - - if sickbeard.PROXY_SETTING: + + + if use_proxy and sickbeard.PROXY_SETTING: + logger.log("Using proxy for url: " + url, logger.DEBUG) proxies = { "http": sickbeard.PROXY_SETTING, "https": sickbeard.PROXY_SETTING, diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 731381d9..487e007a 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -114,7 +114,7 @@ class GenericProvider: if not headers: headers = [] - data = helpers.getURL(url, post_data, headers, json=json) + data = helpers.getURL(url, post_data, headers, json=json, use_proxy=True) if not data: logger.log(u"Error loading " + self.name + " URL: " + url, logger.ERROR) From 348c0edf261c1120a0504c3b0a294c18c587f257 Mon Sep 17 00:00:00 2001 From: Peter Maciocia Date: Wed, 7 May 2014 10:09:09 +0100 Subject: [PATCH 2/2] don't use proxy by default --- sickbeard/providers/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 487e007a..731381d9 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -114,7 +114,7 @@ class GenericProvider: if not headers: headers = [] - data = helpers.getURL(url, post_data, headers, json=json, use_proxy=True) + data = helpers.getURL(url, post_data, headers, json=json) if not data: logger.log(u"Error loading " + self.name + " URL: " + url, logger.ERROR)