src_prepare/euscan-ng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

euscan/helpers: use HEAD in tryurl

Browse Source 
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
This commit is contained in:
Corentin Chary 2011-09-06 15:47:54 +02:00
parent 454d369ced
commit bd75e1af4e
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pym/euscan/helpers.py
View File

@ -189,15 +189,28 @@ def gen_versions(components, level):
return versions return versions
def urlopen(url, timeout=None): def timeout_for_url(url):
if 'sourceforge' in url:
timeout = 15
else:
timeout = 5
return timeout
class HeadRequest(urllib2.Request):
def get_method(self):
return "HEAD"
def urlopen(url, timeout=None, verb="GET"):
if not timeout: if not timeout:
if 'sourceforge' in url: timeout = timeout_for_url(url)
timeout = 15
else: if verb == 'GET':
timeout = 5 request = urllib2.Request(url)
elif verb == 'HEAD':
request = HeadRequest(url)
else:
return None
request = urllib2.Request(url)
request.add_header('User-Agent', CONFIG['user-agent']) request.add_header('User-Agent', CONFIG['user-agent'])
return urllib2.urlopen(request, None, timeout) return urllib2.urlopen(request, None, timeout)
@ -209,7 +222,7 @@ def tryurl(fileurl, template):
try: try:
basename = os.path.basename(fileurl) basename = os.path.basename(fileurl)
fp = urlopen(fileurl) fp = urlopen(fileurl, verb='HEAD')
headers = fp.info() headers = fp.info()
if 'Content-disposition' in headers and basename not in headers['Content-disposition']: if 'Content-disposition' in headers and basename not in headers['Content-disposition']: