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

do not use old API anymore (disabled by faggots)

Browse source
This commit is contained in:
Romain Bignon 2012-09-20 14:49:45 +02:00
commit c63c10fb07
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/aum/browser.py
View file

@ -130,13 +130,14 @@ class AuMBrowser(BaseBrowser):
return r return r
def login(self): def login(self):
r = self.api0_request('me', 'login', data={'login': self.username, pass
'pass': self.password, # XXX old API is disabled
}, nologin=True) #r = self.api0_request('me', 'login', data={'login': self.username,
self.my_coords = (float(r['result']['me']['lat']), float(r['result']['me']['lng'])) # 'pass': self.password,
if not self.search_query: # }, nologin=True)
self.search_query = 'region=%s' % r['result']['me']['region'] #self.my_coords = (float(r['result']['me']['lat']), float(r['result']['me']['lng']))
#if not self.search_query:
# self.search_query = 'region=%s' % r['result']['me']['region']
def api_request(self, command, **kwargs): def api_request(self, command, **kwargs):
if 'data' in kwargs: if 'data' in kwargs:
@ -260,16 +261,19 @@ class AuMBrowser(BaseBrowser):
# retrieve query # retrieve query
self.login() self.login()
r = self.api_request('users?count=60&offset=0&%s' % self.search_query) r = self.api_request('users?count=100&offset=0&%s' % self.search_query)
ids = [s['id'] for s in r['results']] ids = [s['id'] for s in r['results']]
return set(ids) return set(ids)
@url2id @url2id
def get_profile(self, id, with_pics=True): def get_profile(self, id, with_pics=True):
r = self.api0_request('member', 'view', data={'id': id}) # XXX OLD API IS DISABLED (fucking faggots)
if not 'result' in r: #r = self.api0_request('member', 'view', data={'id': id})
print r #if not 'result' in r:
profile = r['result']['member'] # print r
#profile = r['result']['member']
profile = {}
profile.update(self.api_request('users/%s' % id)) profile.update(self.api_request('users/%s' % id))

11
modules/aum/contact.py
View file

@ -158,11 +158,12 @@ class Contact(_Contact):
('visites', FieldPopu('visites')), ('visites', FieldPopu('visites')),
('invits', FieldPopu('invits')), ('invits', FieldPopu('invits')),
('bonus', FieldPopu('bonus')), ('bonus', FieldPopu('bonus')),
('score', FieldPopu('popu')), ('score', FieldStr('points')),
('ratio', FieldPopuRatio('mails', 'flashs')), ('ratio', FieldPopuRatio('mails', 'flashs')),
('mailable', FieldBool('can_mail')), ('mailable', FieldBool('can_mail')),
))), ))),
('details', OrderedDict(( ('details', OrderedDict((
('old', FieldStr('age')),
('old', FieldOld('birthday')), ('old', FieldOld('birthday')),
('birthday', FieldStr('birthday')), ('birthday', FieldStr('birthday')),
('zipcode', FieldStr('zip')), ('zipcode', FieldStr('zip')),
@ -244,8 +245,12 @@ class Contact(_Contact):
s = ProfileNode(section, section.capitalize(), OrderedDict(), flags=flags) s = ProfileNode(section, section.capitalize(), OrderedDict(), flags=flags)
for key, builder in d.iteritems(): for key, builder in d.iteritems():
value = builder.get_value(profile, consts[int(profile['sex'])]) try:
s.value[key] = ProfileNode(key, key.capitalize().replace('_', ' '), value) value = builder.get_value(profile, consts[int(profile['sex'])])
except KeyError:
pass
else:
s.value[key] = ProfileNode(key, key.capitalize().replace('_', ' '), value)
self.profile[section] = s self.profile[section] = s