mirror of
https://github.com/domainaware/parsedmarc.git
synced 2026-07-09 18:25:09 +00:00
remove batch_size from fetch_messages method
This commit is contained in:
@@ -1064,7 +1064,7 @@ def get_dmarc_reports_from_mailbox(connection: MailboxConnection,
|
||||
connection.create_folder(forensic_reports_folder)
|
||||
connection.create_folder(invalid_reports_folder)
|
||||
|
||||
messages = connection.fetch_messages(batch_size, reports_folder)
|
||||
messages = connection.fetch_messages(reports_folder)
|
||||
total_messages = len(messages)
|
||||
logger.debug("Found {0} messages in {1}".format(len(messages),
|
||||
reports_folder))
|
||||
@@ -1170,7 +1170,7 @@ def get_dmarc_reports_from_mailbox(connection: MailboxConnection,
|
||||
results = OrderedDict([("aggregate_reports", aggregate_reports),
|
||||
("forensic_reports", forensic_reports)])
|
||||
|
||||
total_messages = len(connection.fetch_messages(batch_size, reports_folder))
|
||||
total_messages = len(connection.fetch_messages(reports_folder))
|
||||
|
||||
if not test and not batch_size and total_messages > 0:
|
||||
# Process emails that came in during the last run
|
||||
|
||||
@@ -50,7 +50,7 @@ class MSGraphConnection(MailboxConnection):
|
||||
else:
|
||||
logger.warning(f'Unknown response {resp.status_code} {resp.json()}')
|
||||
|
||||
def fetch_messages(self, batch_size: int, folder_name: str) -> List[str]:
|
||||
def fetch_messages(self, folder_name: str) -> List[str]:
|
||||
""" Returns a list of message UIDs in the specified folder """
|
||||
folder_id = self._find_folder_id_from_folder_path(folder_name)
|
||||
result = self._client.get(f'/users/{self.mailbox_name}/mailFolders/{folder_id}/messages?$select=id')
|
||||
|
||||
@@ -32,7 +32,7 @@ class IMAPConnection(MailboxConnection):
|
||||
def create_folder(self, folder_name: str):
|
||||
self._client.create_folder(folder_name)
|
||||
|
||||
def fetch_messages(self, batch_size, reports_folder: str):
|
||||
def fetch_messages(self, reports_folder: str):
|
||||
self._client.select_folder(reports_folder)
|
||||
return self._client.search()
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ class MailboxConnection(ABC):
|
||||
def create_folder(self, folder_name: str):
|
||||
raise NotImplementedError
|
||||
|
||||
def fetch_messages(self, batch_size: int, reports_folder: str) -> List[str]:
|
||||
def fetch_messages(self, reports_folder: str) -> List[str]:
|
||||
raise NotImplementedError
|
||||
|
||||
def fetch_message(self, message_id) -> str:
|
||||
|
||||
Reference in New Issue
Block a user