From b366d1b88f408a42ade4edb5e8abefeae571b8b9 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Tue, 17 Nov 2020 17:12:34 +0100 Subject: [PATCH] adjustments due to refactor --- src/paperless_mail/mail.py | 12 ++++++------ src/paperless_mail/tests/test_mail.py | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index 69fadf633..ce8bf9459 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -213,12 +213,12 @@ def handle_message(message, rule): async_task( "documents.tasks.consume_file", - file=temp_filename, - original_filename=att.filename, - force_title=title, - force_correspondent_id=correspondent.id if correspondent else None, - force_document_type_id=doc_type.id if doc_type else None, - force_tag_ids=[tag.id] if tag else None, + path=temp_filename, + override_filename=att.filename, + override_title=title, + override_correspondent_id=correspondent.id if correspondent else None, + override_document_type_id=doc_type.id if doc_type else None, + override_tag_ids=[tag.id] if tag else None, task_name=f"Mail: {att.filename}" ) diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 37740bb9b..9ad826b06 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -89,11 +89,11 @@ class TestMail(TestCase): args1, kwargs1 = m.call_args_list[0] args2, kwargs2 = m.call_args_list[1] - self.assertEqual(kwargs1['force_title'], "test1") - self.assertEqual(kwargs1['original_filename'], "test1.pdf") + self.assertEqual(kwargs1['override_title'], "test1") + self.assertEqual(kwargs1['override_filename'], "test1.pdf") - self.assertEqual(kwargs2['force_title'], "test2") - self.assertEqual(kwargs2['original_filename'], "test2.pdf") + self.assertEqual(kwargs2['override_title'], "test2") + self.assertEqual(kwargs2['override_filename'], "test2.pdf") @mock.patch("paperless_mail.mail.async_task") def test_handle_empty_message(self, m):