Jafner/calibre-web
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Fix a problem with sending emails from custom domain name server (#2301)

Browse Source
This commit is contained in:
Ozzie Isaacs 2022-02-08 19:35:00 +01:00
parent 7bb3cac7fb
commit e9b674f46e
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/tasks/convert.py
View File

@ -35,6 +35,8 @@ from cps.ub import init_db_thread
from cps.tasks.mail import TaskEmail from cps.tasks.mail import TaskEmail
from cps import gdriveutils from cps import gdriveutils
log = logger.create() log = logger.create()

54
cps/tasks/mail.py
View File

@ -23,16 +23,8 @@ import threading
import socket import socket
import mimetypes import mimetypes
try: from io import StringIO
from StringIO import StringIO from email.message import EmailMessage
from email.MIMEBase import MIMEBase
from email.MIMEMultipart import MIMEMultipart
from email.MIMEText import MIMEText
except ImportError:
from io import StringIO
from email.mime.base import MIMEBase
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
@ -131,19 +123,24 @@ class TaskEmail(CalibreTask):
self.results = dict() self.results = dict()
def prepare_message(self): def prepare_message(self):
message = MIMEMultipart() message = EmailMessage()
# message = MIMEMultipart()
message['to'] = self.recipent message['to'] = self.recipent
message['from'] = self.settings["mail_from"] message['from'] = self.settings["mail_from"]
message['subject'] = self.subject message['subject'] = self.subject
message['Message-Id'] = make_msgid('calibre-web') message['Message-Id'] = make_msgid('calibre-web')
message['Date'] = formatdate(localtime=True) message['Date'] = formatdate(localtime=True)
text = self.text # text = self.text
msg = MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8') message.set_content(self.text.encode('UTF-8'), "text", "plain")
message.attach(msg)
if self.attachment: if self.attachment:
result = self._get_attachment(self.filepath, self.attachment) data = self._get_attachment(self.filepath, self.attachment)
if result: if data:
message.attach(result) # Set mimetype
content_type, encoding = mimetypes.guess_type(self.attachment)
if content_type is None or encoding is not None:
content_type = 'application/octet-stream'
main_type, sub_type = content_type.split('/', 1)
message.add_attachment(data, maintype=main_type, subtype=sub_type, filename=self.attachment)
else: else:
self._handleError(u"Attachment not found") self._handleError(u"Attachment not found")
return return
@ -226,15 +223,15 @@ class TaskEmail(CalibreTask):
self._progress = x self._progress = x
@classmethod @classmethod
def _get_attachment(cls, bookpath, filename): def _get_attachment(cls, book_path, filename):
"""Get file as MIMEBase message""" """Get file as MIMEBase message"""
calibre_path = config.config_calibre_dir calibre_path = config.config_calibre_dir
if config.config_use_google_drive: if config.config_use_google_drive:
df = gdriveutils.getFileFromEbooksFolder(bookpath, filename) df = gdriveutils.getFileFromEbooksFolder(book_path, filename)
if df: if df:
datafile = os.path.join(calibre_path, bookpath, filename) datafile = os.path.join(calibre_path, book_path, filename)
if not os.path.exists(os.path.join(calibre_path, bookpath)): if not os.path.exists(os.path.join(calibre_path, book_path)):
os.makedirs(os.path.join(calibre_path, bookpath)) os.makedirs(os.path.join(calibre_path, book_path))
df.GetContentFile(datafile) df.GetContentFile(datafile)
else: else:
return None return None
@ -244,23 +241,14 @@ class TaskEmail(CalibreTask):
os.remove(datafile) os.remove(datafile)
else: else:
try: try:
file_ = open(os.path.join(calibre_path, bookpath, filename), 'rb') file_ = open(os.path.join(calibre_path, book_path, filename), 'rb')
data = file_.read() data = file_.read()
file_.close() file_.close()
except IOError as e: except IOError as e:
log.debug_or_exception(e, stacklevel=3) log.debug_or_exception(e, stacklevel=3)
log.error(u'The requested file could not be read. Maybe wrong permissions?') log.error(u'The requested file could not be read. Maybe wrong permissions?')
return None return None
# Set mimetype return data
content_type, encoding = mimetypes.guess_type(filename)
if content_type is None or encoding is not None:
content_type = 'application/octet-stream'
main_type, sub_type = content_type.split('/', 1)
attachment = MIMEBase(main_type, sub_type)
attachment.set_payload(data)
encoders.encode_base64(attachment)
attachment.add_header('Content-Disposition', 'attachment', filename=filename)
return attachment
@property @property
def name(self): def name(self):