Merge branch 'coddingtonbear:master' into master

django_mailbox/management/commands/getmail.py

@@ -5,26 +5,7 @@ from django.core.management.base import BaseCommand
 from django_mailbox.models import Mailbox
 
 
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
-
-
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        mailboxes = Mailbox.active_mailboxes.all()
+        logging.basicConfig(level=logging.INFO)
-        if args:
+        Mailbox.get_new_mail_all_mailboxes(args)
-            mailboxes = mailboxes.filter(
-                name=' '.join(args)
-            )
-        for mailbox in mailboxes:
-            logger.info(
-                'Gathering messages for %s',
-                mailbox.name
-            )
-            messages = mailbox.get_new_mail()
-            for message in messages:
-                logger.info(
-                    'Received %s (from %s)',
-                    message.subject,
-                    message.from_address
-                )

django_mailbox/models.py

@@ -462,6 +462,27 @@ class Mailbox(models.Model):
         else:
             self.save()
 
+    @staticmethod
+    def get_new_mail_all_mailboxes(args=None):
+        mailboxes = Mailbox.active_mailboxes.all()
+        if args:
+            mailboxes = mailboxes.filter(
+                name=' '.join(args)
+            )
+        for mailbox in mailboxes:
+            logger.info(
+                'Gathering messages for %s',
+                mailbox.name
+            )
+            messages = mailbox.get_new_mail()
+            for message in messages:
+                logger.info(
+                    'Received %s (from %s)',
+                    message.subject,
+                    message.from_address
+                )
+
+
     def __str__(self):
         return self.name