Bladeren bron

feat: add filter for append_to wrt imap_folder

version-14
kamaljohnson 3 jaren geleden
bovenliggende
commit
eb574ca9f1
2 gewijzigde bestanden met toevoegingen van 7 en 6 verwijderingen
  1. +5
    -5
      frappe/email/doctype/email_account/email_account.py
  2. +2
    -1
      frappe/email/receive.py

+ 5
- 5
frappe/email/doctype/email_account/email_account.py Bestand weergeven

@@ -481,11 +481,11 @@ class EmailAccount(Document):
if self.use_imap: if self.use_imap:
# process all given imap folder # process all given imap folder
for folder in self.imap_folder: for folder in self.imap_folder:
email_server.select_imap_folder(folder.folder_name)
email_server.settings['uid_validity'] = folder.uidvalidity
messages = email_server.get_messages(folder=folder.folder_name) or {}
append_to = folder.append_to
process_mail(messages, append_to)
if email_server.select_imap_folder(folder.folder_name):
frappe.log_error(f'FOLDER NAME: {folder.folder_name} PRESENT')
email_server.settings['uid_validity'] = folder.uidvalidity
messages = email_server.get_messages(folder=f'"{folder.folder_name}"') or {}
process_mail(messages, folder.append_to)
else: else:
# process the pop3 account # process the pop3 account
messages = email_server.get_messages() or {} messages = email_server.get_messages() or {}


+ 2
- 1
frappe/email/receive.py Bestand weergeven

@@ -108,7 +108,8 @@ class EmailServer:
raise raise


def select_imap_folder(self, folder): def select_imap_folder(self, folder):
self.imap.select(folder)
res = self.imap.select(f'"{folder}"')
return res[0] == 'OK' # The folder exsits TODO: handle other resoponses too


def logout(self): def logout(self):
if cint(self.settings.use_imap): if cint(self.settings.use_imap):


Laden…
Annuleren
Opslaan