federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Cleaning up management commands for PEP-8 and consistency.

Browse source
This commit is contained in:
Adam Coddington 2014-08-22 20:02:58 -07:00
parent 992375fc6b
commit db6190a295
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
django_mailbox/management/commands/getmail.py
View file

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

11
django_mailbox/management/commands/processincomingmessage.py
View file

@ -7,9 +7,11 @@ from django.core.management.base import BaseCommand
from django_mailbox.models import Mailbox from django_mailbox.models import Mailbox
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
class Command(BaseCommand): class Command(BaseCommand):
args = "<[Mailbox Name (optional)]>" args = "<[Mailbox Name (optional)]>"
command = "Receive incoming mail via stdin" command = "Receive incoming mail via stdin"
@ -22,14 +24,17 @@ class Command(BaseCommand):
else: else:
mailbox = self.get_mailbox_for_message(message) mailbox = self.get_mailbox_for_message(message)
mailbox.process_incoming_message(message) mailbox.process_incoming_message(message)
logger.info("Message received from %s" % message['from']) logger.info(
"Message received from %s",
message['from']
)
else: else:
logger.warning("Message not processable.") logger.warning("Message not processable.")
def get_mailbox_by_name(self, name): def get_mailbox_by_name(self, name):
mailbox, created = Mailbox.objects.get_or_create( mailbox, created = Mailbox.objects.get_or_create(
name=name, name=name,
) )
return mailbox return mailbox
def get_mailbox_for_message(self, message): def get_mailbox_for_message(self, message):