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

iter_unread_messages() doesn't raise any exception when website is unavailable

Browse source
This commit is contained in:
Romain Bignon 2010-08-31 18:09:11 +02:00
commit 0b3b020798
1 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,39 +151,43 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
return thread return thread
def iter_unread_messages(self, thread=None): def iter_unread_messages(self, thread=None):
with self.browser: try:
contacts = self.browser.get_threads_list() with self.browser:
for contact in contacts: contacts = self.browser.get_threads_list()
slut = self._get_slut(contact.get_id()) for contact in contacts:
if contact.get_lastmsg_date() > slut['lastmsg']: slut = self._get_slut(contact.get_id())
thread = self.get_thread(contact.get_id()) if contact.get_lastmsg_date() > slut['lastmsg']:
for m in thread.iter_all_messages(): thread = self.get_thread(contact.get_id())
if m.flags & m.IS_UNREAD: for m in thread.iter_all_messages():
yield m if m.flags & m.IS_UNREAD:
yield m
# Send mail when someone added me in her basket. # Send mail when someone added me in her basket.
# XXX possibly race condition if a slut adds me in her basket # XXX possibly race condition if a slut adds me in her basket
# between the aum.nb_new_baskets() and aum.get_baskets(). # between the aum.nb_new_baskets() and aum.get_baskets().
with self.browser: with self.browser:
new_baskets = self.browser.nb_new_baskets() new_baskets = self.browser.nb_new_baskets()
if new_baskets: if new_baskets:
ids = self.browser.get_baskets() ids = self.browser.get_baskets()
while new_baskets > 0 and len(ids) > new_baskets: while new_baskets > 0 and len(ids) > new_baskets:
new_baskets -= 1 new_baskets -= 1
profile = self.browser.get_profile(ids[new_baskets]) profile = self.browser.get_profile(ids[new_baskets])
thread = Thread(profile.get_id()) thread = Thread(profile.get_id())
thread.root = Message(thread=thread, thread.root = Message(thread=thread,
id=self.MAGIC_ID_BASKET, id=self.MAGIC_ID_BASKET,
title='Basket of %s' % profile.get_name(), title='Basket of %s' % profile.get_name(),
sender=profile.get_name(), sender=profile.get_name(),
receiver=self.browser.get_my_name(), receiver=self.browser.get_my_name(),
date=None, # now date=None, # now
content='You are taken in her basket!', content='You are taken in her basket!',
signature=profile.get_profile_text(), signature=profile.get_profile_text(),
children=[], children=[],
flags=Message.IS_UNREAD) flags=Message.IS_UNREAD)
yield thread.root yield thread.root
except BrowserUnavailable, e:
debug('No messages, browser is unavailable: %s' % e)
pass # don't care about waiting
def set_message_read(self, message): def set_message_read(self, message):
if message.id == self.MAGIC_ID_BASKET: if message.id == self.MAGIC_ID_BASKET:
@ -297,7 +301,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
def fill_contact(self, contact, fields): def fill_contact(self, contact, fields):
if 'profile' in fields: if 'profile' in fields:
contact = self.get_contact(contact) contact = self.get_contact(contact)
if 'photos' in fields and contact.photos: if contact and 'photos' in fields:
for name, photo in contact.photos.iteritems(): for name, photo in contact.photos.iteritems():
with self.browser: with self.browser:
if photo.url: if photo.url: