diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py index 84e7be9767f17a0fe39fd0a191d2e9c499c5c215..2f312bac97b8e291510c781529ad0f6e074b7d93 100644 --- a/weboob/backends/aum/backend.py +++ b/weboob/backends/aum/backend.py @@ -25,5 +25,5 @@ class AuMBackend(Backend, ICapMessages, ICapMessagesReply): def __init__(self, weboob): Backend.__init__(self, weboob) - def getNewMessages(self, thread=None): + def iter_messages(self, thread=None): pass diff --git a/weboob/backends/dlfp/backend.py b/weboob/backends/dlfp/backend.py index 2a955802b7b21053c8305e523425843eb62ba62a..80c63bdc72f361bb55ae71df76d1485b92a036dc 100644 --- a/weboob/backends/dlfp/backend.py +++ b/weboob/backends/dlfp/backend.py @@ -20,11 +20,13 @@ from weboob.backend import Backend from weboob.capabilities.messages import ICapMessages, ICapMessagesReply, Message +from feeds import ArticlesList class DLFPBackend(Backend, ICapMessages, ICapMessagesReply): def __init__(self, weboob): Backend.__init__(self, weboob) - def getNewMessages(self, thread=None): - m = Message('threadid', 'msgid', 'Title', 'Sender', signature='Bite bite bite bite', content='Content content\nContent content.') - return [m] + def iter_messages(self, thread=None): + articles_list = ArticlesList('newspaper') + for id, author, title in articles_list.iter_articles(): + yield Message('threadid', id, title, author, signature='Bite bite bite bite', content='Content content\nContent content.') diff --git a/weboob/backends/dlfp/feeds.py b/weboob/backends/dlfp/feeds.py index ea06a873a195ecfc68ca12cdf238689c30140c37..f067cbc633aa444152b1db3140bad872b2c9b1e1 100644 --- a/weboob/backends/dlfp/feeds.py +++ b/weboob/backends/dlfp/feeds.py @@ -47,7 +47,7 @@ def __init__(self, section=None): self.section = section self.articles = [] - def fetch(self): + def iter_articles(self): for section, klass in self.RSS.iteritems(): if self.section and self.section != section: continue @@ -61,4 +61,4 @@ def fetch(self): continue _id = m.group(1) article = klass(_id, item['link'], item['title'], item['author'], item['date_parsed']) - print _id, item['author'], item['title'] + yield _id, item['author'], item['title'] diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index 86a62471d9bfd9ac1c5cfbc848065528bf3272e6..754c6ebf57164a825d84923fda5ca8eb402c312d 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -73,7 +73,7 @@ def isNew(self): return self.new class ICapMessages: - def getNewMessages(self, thread=None): + def iter_messages(self, thread=None): """ Get new messages from last time this function has been called. diff --git a/weboob2mail b/weboob2mail index 6bc3ff0e3966424532d3320884befdebf9a84f08..93d8770435780154a6cb3d9b4e930aba1bdf8913 100755 --- a/weboob2mail +++ b/weboob2mail @@ -59,9 +59,8 @@ class Application(BaseApplication): def process(self): backends = self.weboob.getBackends() for name, b in backends.iteritems(): - messages = b.getNewMessages() - for m in messages: - self.send_email(name, m) + for message in b.iter_messages(): + self.send_email(name, message) def send_email(self, backend_name, mail): domain = self.config['domain']