mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-09 22:38:19 +02:00
Code Activity

Merge pull request #228 from SyaOS/fix-admin-action

Browse source 
Fix get_new_mail admin action.
This commit is contained in:
Adam Dobrawy 2020-10-10 03:48:45 +02:00 • committed by GitHub
commit 225da2155f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
django_mailbox/admin.py
View file

@ -20,9 +20,7 @@ logger = logging.getLogger(__name__)
def get_new_mail(mailbox_admin, request, queryset):
for mailbox in queryset.all():
logger.debug('Receiving mail for %s' % mailbox)
mailbox.get_new_mail()
queryset.get_new_mail()
get_new_mail.short_description = _('Get new mail')

18
django_mailbox/models.py
View file

@ -36,7 +36,21 @@ from django_mailbox.transports import Pop3Transport, ImapTransport, \
logger = logging.getLogger(__name__)
class ActiveMailboxManager(models.Manager):
class MailboxQuerySet(models.QuerySet):
def get_new_mail(self):
count = 0
for mailbox in self.all():
logger.debug('Receiving mail for %s' % mailbox)
count += sum(1 for i in mailbox.get_new_mail())
logger.debug('Received %d %s.', count, 'mails' if count != 1 else 'mail')
class MailboxManager(models.Manager):
def get_queryset(self):
return MailboxQuerySet(self.model, using=self._db)
class ActiveMailboxManager(MailboxManager):
def get_queryset(self):
return super().get_queryset().filter(
active=True,
@ -106,7 +120,7 @@ class Mailbox(models.Model):
null=True
)
objects = models.Manager()
objects = MailboxManager()
active_mailboxes = ActiveMailboxManager()
@property

10
django_mailbox/tests/test_mailbox.py
View file

@ -34,3 +34,13 @@ class TestMailbox(TestCase):
self.assertEqual(mailbox.last_polling, None)
list(mailbox.get_new_mail())
self.assertNotEqual(mailbox.last_polling, None)
def test_queryset_get_new_mail(self):
mailbox = Mailbox.objects.create(uri="mbox://" + os.path.join(
os.path.dirname(__file__),
'messages',
'generic_message.eml',
))
Mailbox.objects.filter(pk=mailbox.pk).get_new_mail()
mailbox.refresh_from_db()
self.assertNotEqual(mailbox.last_polling, None)