From 3d79c0d150300d4f59531c8610f85f3927b085bc Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Fri, 31 Jul 2015 06:46:57 +0000 Subject: Adapted maintenace.load_mails to new data model. - Issue #420 --- service/pixelated/maintenance.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'service/pixelated/maintenance.py') diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py index bffc272f..fd81f8a8 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -119,7 +119,7 @@ def is_keep_file(mail): @defer.inlineCallbacks def add_mail_folder(store, maildir, folder_name, deferreds): - store.add_mailbox(folder_name) + yield store.add_mailbox(folder_name) for mail in maildir: if is_keep_file(mail): @@ -144,12 +144,13 @@ def load_mails(args, mail_paths): for path in mail_paths: maildir = Maildir(path, factory=None) - add_mail_folder(store, maildir, 'INBOX', deferreds) + yield add_mail_folder(store, maildir, 'INBOX', deferreds) for mail_folder_name in maildir.list_folders(): mail_folder = maildir.get_folder(mail_folder_name) - add_mail_folder(store, mail_folder, mail_folder_name, deferreds) + yield add_mail_folder(store, mail_folder, mail_folder_name, deferreds) + + yield defer.gatherResults(deferreds, consumeErrors=True) - yield defer.DeferredList(deferreds) defer.returnValue(args) -- cgit v1.2.3