maryjane/gpodder
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Wiki Activity

Split util.get_episode_info_from_url() for code reuse.

Browse source 
The part that issues different requests depending on the
availability of a proxy server is now reusable.
This commit is contained in:
Justin Forest 2008-10-13 17:28:05 +04:00 committed by Thomas Perl
parent ad7310c9dc
commit 661a4381e1
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gpodder/util.py
View file

@ -865,6 +865,18 @@ def format_seconds_to_hour_min_sec(seconds):
else:
return result[0]
def proxy_request(url, proxy=None):
if proxy is None or proxy.strip() == '':
(scheme, netloc, path, parms, qry, fragid) = urlparse.urlparse(url)
conn = httplib.HTTPConnection(netloc)
start = len(scheme) + len('://') + len(netloc)
conn.request('HEAD', url[start:])
else:
(scheme, netloc, path, parms, qry, fragid) = urlparse.urlparse(proxy)
conn = httplib.HTTPConnection(netloc)
conn.request('HEAD', url)
return conn.getresponse()
def get_episode_info_from_url(url, proxy=None):
"""
@ -886,17 +898,7 @@ def get_episode_info_from_url(url, proxy=None):
if not (url.startswith('http://') or url.startswith('https://')):
return {}
if proxy is None or proxy.strip() == '':
(scheme, netloc, path, parms, qry, fragid) = urlparse.urlparse(url)
conn = httplib.HTTPConnection(netloc)
start = len(scheme) + len('://') + len(netloc)
conn.request('HEAD', url[start:])
else:
(scheme, netloc, path, parms, qry, fragid) = urlparse.urlparse(proxy)
conn = httplib.HTTPConnection(netloc)
conn.request('HEAD', url)
r = conn.getresponse()
r = proxy_request(url, proxy)
result = {}
log('Trying to get metainfo for %s', url)