nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ipinfodb] form changed from GET to POST

Browse source
This commit is contained in:
Julien Veyssier 2013-10-27 02:53:59 +02:00 • committed by Romain Bignon
commit c4ea02593e
1 changed files with 42 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

59
modules/ipinfodb/backend.py
View file

@ -21,7 +21,7 @@
from weboob.capabilities.geolocip import ICapGeolocIp, IpLocation from weboob.capabilities.geolocip import ICapGeolocIp, IpLocation
from weboob.tools.backend import BaseBackend from weboob.tools.backend import BaseBackend
from weboob.tools.browser import BaseBrowser, BrowserUnavailable from weboob.tools.browser import StandardBrowser
__all__ = ['IpinfodbBackend'] __all__ = ['IpinfodbBackend']
@ -34,19 +34,15 @@ class IpinfodbBackend(BaseBackend, ICapGeolocIp):
VERSION = '0.h' VERSION = '0.h'
LICENSE = 'AGPLv3+' LICENSE = 'AGPLv3+'
DESCRIPTION = u"IPInfoDB IP addresses geolocation service" DESCRIPTION = u"IPInfoDB IP addresses geolocation service"
BROWSER = BaseBrowser BROWSER = StandardBrowser
def get_location(self, ipaddr): def get_location(self, ipaddr):
with self.browser: self.browser.location("http://ipinfodb.com/ip_locator.php")
self.browser.select_form(nr=0)
self.browser['ip'] = str(ipaddr)
response = self.browser.submit()
document = self.browser.get_document(response)
content = self.browser.readurl('http://ipinfodb.com/ip_locator.php?ip=%s' % str(ipaddr))
if content is None:
raise BrowserUnavailable()
if 'Invalid IP or domain name' in content:
raise Exception('Bad parameter')
else:
tab = {'City' : 'NA' , tab = {'City' : 'NA' ,
'Country name' : 'NA' , 'Country name' : 'NA' ,
'Region' : 'NA' , 'Region' : 'NA' ,
@ -54,33 +50,32 @@ class IpinfodbBackend(BaseBackend, ICapGeolocIp):
'Longitude' : 'NA' , 'Longitude' : 'NA' ,
'hostname' : 'NA' , 'hostname' : 'NA' ,
'zipcode' : 'NA'} 'zipcode' : 'NA'}
line = '' for li in document.getiterator('li'):
for line in content.split('\n'): txt = li.text_content()
if '<li>' in line: if 'Country :' in txt:
if 'Country :' in line: tab['Country name'] = txt.split('Country : ')[1].split('<')[0]
tab['Country name'] = line.split('Country : ')[1].split('<')[0] elif "State/Province :" in txt:
elif "State/Province :" in line: tab['Region'] = txt.split('State/Province : ')[1].split('<')[0]
tab['Region'] = line.split('State/Province : ')[1].split('<')[0] elif "City :" in txt:
elif "City :" in line: tab['City'] = txt.split('City : ')[1].split('<')[0]
tab['City'] = line.split('City : ')[1].split('<')[0] elif "Latitude :" in txt:
elif "Latitude :" in line: tab['Latitude'] = txt.split('Latitude : ')[1].split('<')[0]
tab['Latitude'] = line.split('Latitude : ')[1].split('<')[0] elif "Longitude :" in txt:
elif "Longitude :" in line: tab['Longitude'] = txt.split('Longitude : ')[1].split('<')[0]
tab['Longitude'] = line.split('Longitude : ')[1].split('<')[0] elif "Hostname :" in txt:
elif "Hostname :" in line: tab['hostname'] = txt.split('Hostname : ')[1].split('<')[0]
tab['hostname'] = line.split('Hostname : ')[1].split('<')[0]
iploc = IpLocation(ipaddr) iploc = IpLocation(ipaddr)
iploc.city = tab['City'].decode('utf-8') iploc.city = unicode(tab['City'].decode('utf-8'))
iploc.region = tab['Region'] iploc.region = unicode(tab['Region'])
iploc.zipcode = tab['zipcode'] iploc.zipcode = unicode(tab['zipcode'])
iploc.country = tab['Country name'] iploc.country = unicode(tab['Country name'])
try : try :
iploc.lt = float(tab['Latitude']) iploc.lt = float(tab['Latitude'])
iploc.lg = float(tab['Longitude']) iploc.lg = float(tab['Longitude'])
except ValueError: except ValueError:
pass pass
iploc.host = tab['hostname'] iploc.host = unicode(tab['hostname'])
iploc.tld = tab['hostname'].split('.')[-1] iploc.tld = unicode(tab['hostname'].split('.')[-1])
#iploc.isp = 'NA' #iploc.isp = 'NA'
return iploc return iploc