From 928dbcb16d3606e7368d8b862344c19e71d0755f Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 20 Nov 2010 19:52:41 +0100 Subject: [PATCH] rename 'shown' to 'hidden' --- weboob/backends/aum/backend.py | 6 ++++-- weboob/backends/aum/pages/profile.py | 4 ++-- weboob/capabilities/contact.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py index 56b2bf67..5af096ce 100644 --- a/weboob/backends/aum/backend.py +++ b/weboob/backends/aum/backend.py @@ -343,8 +343,10 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh contact.status_msg = profile.get_status() contact.summary = profile.description for photo in profile.photos: - contact.set_photo(photo['url'].split('/')[-1], url=photo['url'], - thumbnail_url=photo['url'].replace('image', 'thumb1_'), shown=photo['shown']) + contact.set_photo(photo['url'].split('/')[-1], + url=photo['url'], + thumbnail_url=photo['url'].replace('image', 'thumb1_'), + hidden=photo['hidden']) contact.profile = [] stats = ProfileNode('stats', 'Stats', [], flags=ProfileNode.HEAD|ProfileNode.SECTION) diff --git a/weboob/backends/aum/pages/profile.py b/weboob/backends/aum/pages/profile.py index 9ba4787f..666fc3c4 100644 --- a/weboob/backends/aum/pages/profile.py +++ b/weboob/backends/aum/pages/profile.py @@ -273,14 +273,14 @@ class ProfilePage(PageBase): m = self.PHOTO_REGEXP.match(div.getAttribute('background')) if m: self.photos.append(dict(url=re.sub(u'thumb[0-2]_', u'image', div.getAttribute('background')), - shown=True)) + hidden=False)) photo_regex = re.compile('(?Phttp://.+\.adopteunmec\.com/.+/)image(?P.+)\.jpg') photo_max_id = max(int(photo_regex.match(photo['url']).groupdict()['id']) for photo in self.photos) base_url = photo_regex.match(self.photos[0]['url']).groupdict()['base_url'] for id in xrange(1, photo_max_id + 1): url = '%simage%s.jpg' % (base_url, id) if not url in [photo['url'] for photo in self.photos]: - self.photos.append(dict(url=url, shown=False)) + self.photos.append(dict(url=url, hidden=True)) if div.hasAttribute('width') and str(div.getAttribute('width')) == '226': trs = div.getElementsByTagName('tr') for tr in trs: diff --git a/weboob/capabilities/contact.py b/weboob/capabilities/contact.py index 97db4b25..73a0c36e 100644 --- a/weboob/capabilities/contact.py +++ b/weboob/capabilities/contact.py @@ -41,7 +41,7 @@ class ContactPhoto(CapBaseObject): self.add_field('data', str) self.add_field('thumbnail_url', basestring) self.add_field('thumbnail_data', basestring) - self.add_field('shown', bool) + self.add_field('hidden', bool, False) def __iscomplete__(self): return (self.data and (not self.thumbnail_url or self.thumbnail_data))