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

add profile information in mail signatures (fix regression)

Browse source
This commit is contained in:
Romain Bignon 2010-09-25 01:55:29 -04:00
commit 9d1b50ebe7
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
weboob/backends/aum/backend.py
View file

@ -97,7 +97,12 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
thread = Thread(contact.get_id()) thread = Thread(contact.get_id())
yield thread yield thread
def get_thread(self, id): def get_thread(self, id, profiles=None):
"""
Get a thread and its messages.
The 'profiles' parameter is only used for internal calls.
"""
thread = None thread = None
if isinstance(id, Thread): if isinstance(id, Thread):
thread = id thread = id
@ -116,6 +121,8 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
child = None child = None
msg = None msg = None
slut = self._get_slut(id) slut = self._get_slut(id)
if not profiles:
profiles = {}
for mail in mails: for mail in mails:
flags = 0 flags = 0
if mail.date > slut['lastmsg']: if mail.date > slut['lastmsg']:
@ -126,6 +133,10 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
else: else:
flags |= Message.IS_ACCUSED flags |= Message.IS_ACCUSED
if not mail.profile_link in profiles:
profiles[mail.profile_link] = self.browser.get_profile(mail.profile_link)
mail.signature += u'\n%s' % profiles[mail.profile_link].get_profile_text()
msg = Message(thread=thread, msg = Message(thread=thread,
id=mail.message_id, id=mail.message_id,
title=mail.title, title=mail.title,
@ -152,12 +163,13 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
def iter_unread_messages(self, thread=None): def iter_unread_messages(self, thread=None):
try: try:
profiles = {}
with self.browser: with self.browser:
contacts = self.browser.get_threads_list() contacts = self.browser.get_threads_list()
for contact in contacts: for contact in contacts:
slut = self._get_slut(contact.get_id()) slut = self._get_slut(contact.get_id())
if contact.get_lastmsg_date() > slut['lastmsg']: if contact.get_lastmsg_date() > slut['lastmsg']:
thread = self.get_thread(contact.get_id()) thread = self.get_thread(contact.get_id(), profiles)
for m in thread.iter_all_messages(): for m in thread.iter_all_messages():
if m.flags & m.IS_UNREAD: if m.flags & m.IS_UNREAD:
yield m yield m