From 3f488828449f16c1ae1a9a8ec64e490acd8fe0bd Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 3 Dec 2011 21:50:36 +0100 Subject: [PATCH] fix profiles urls --- weboob/backends/aum/backend.py | 4 ++-- weboob/backends/aum/browser.py | 6 +++++- weboob/backends/aum/contact.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py index 3b5bf1b9..d38eb039 100644 --- a/weboob/backends/aum/backend.py +++ b/weboob/backends/aum/backend.py @@ -206,8 +206,8 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh flags |= Message.IS_ACCUSED signature = u'' - #if mail['src']: - # signature += u'Sent from my %s\n\n' % mail['src'] + if mail.get('src', None): + signature += u'Sent from my %s\n\n' % mail['src'] if mail['id_from'] in contacts: signature += contacts[mail['id_from']].get_text() diff --git a/weboob/backends/aum/browser.py b/weboob/backends/aum/browser.py index 8972e53b..867a08ec 100644 --- a/weboob/backends/aum/browser.py +++ b/weboob/backends/aum/browser.py @@ -77,13 +77,17 @@ class AuMBrowser(BaseBrowser): my_coords = (0,0) def id2url(self, id): - return 'http://www.adopteunmec.com/%s' % id + return 'http://www.adopteunmec.com/index.php/profile/%s' % id def url2id(func): def inner(self, id, *args, **kwargs): m = re.match('^http://.*adopteunmec.com.*/(\d+)$', str(id)) if m: id = int(m.group(1)) + else: + m = re.match('^http://.*adopteunmec.com/index.php/profile/(\d+).*', str(id)) + if m: + id = int(m.group(1)) return func(self, id, *args, **kwargs) return inner diff --git a/weboob/backends/aum/contact.py b/weboob/backends/aum/contact.py index 4e011777..a223758a 100644 --- a/weboob/backends/aum/contact.py +++ b/weboob/backends/aum/contact.py @@ -63,7 +63,7 @@ class FieldProfileURL(FieldBase): def get_value(self, profile, consts): id = int(profile[self.key]) if id > 0: - return 'http://www.adopteunmec.com/%d' % id + return 'http://www.adopteunmec.com/index.php/profile/%d' % id else: return ''