mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 10:37:23 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'csv_kindle/master'

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-07-07 14:49:22 +02:00
commit c4a38087d9
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cps/helper.py
View File

@ -117,9 +117,11 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
# Texts are not lazy translated as they are supposed to get send out as is # Texts are not lazy translated as they are supposed to get send out as is
def send_test_mail(ereader_mail, user_name): def send_test_mail(ereader_mail, user_name):
WorkerThread.add(user_name, TaskEmail(_('Calibre-Web Test Email'), None, None, for email in ereader_mail.split(','):
config.get_mail_settings(), ereader_mail, N_("Test Email"), email = email.strip()
_('This Email has been sent via Calibre-Web.'))) WorkerThread.add(user_name, TaskEmail(_('Calibre-Web Test Email', None, None,
config.get_mail_settings(), email, N_("Test Email"),
_('This Email has been sent via Calibre-Web.'))))
return return
@ -225,9 +227,11 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
converted_file_name = entry.name + '.' + book_format.lower() converted_file_name = entry.name + '.' + book_format.lower()
link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title)) link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
email_text = N_("%(book)s send to eReader", book=link) email_text = N_("%(book)s send to eReader", book=link)
WorkerThread.add(user_id, TaskEmail(_("Send to eReader"), book.path, converted_file_name, for email in ereader_mail.split(','):
config.get_mail_settings(), ereader_mail, email = email.strip()
email_text, _('This Email has been sent via Calibre-Web.'), book.id)) WorkerThread.add(user_id, TaskEmail(_("Send to eReader"), book.path, converted_file_name,
config.get_mail_settings(), email,
email_text, _('This Email has been sent via Calibre-Web.'), book.id))
return return
return _("The requested file could not be read. Maybe wrong permissions?") return _("The requested file could not be read. Maybe wrong permissions?")
@ -691,15 +695,16 @@ def check_username(username):
return username return username
def valid_email(email): def valid_email(emails):
email = email.strip() for email in emails.split(','):
# if email is not deleted email = email.strip()
if email: # if email is not deleted
# Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation if email:
if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$", # Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
email): if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$",
log.error("Invalid Email address format") email):
raise Exception(_("Invalid Email address format")) log.error("Invalid Email address format")
raise Exception(_("Invalid Email address format"))
return email return email

24
cps/tasks/convert.py
View File

@ -105,17 +105,19 @@ class TaskConvert(CalibreTask):
# if we're sending to E-Reader after converting, create a one-off task and run it immediately # if we're sending to E-Reader after converting, create a one-off task and run it immediately
# todo: figure out how to incorporate this into the progress # todo: figure out how to incorporate this into the progress
try: try:
EmailText = N_("%(book)s send to E-Reader", book=escape(self.title)) EmailText = N_(u"%(book)s send to E-Reader", book=escape(self.title))
worker_thread.add(self.user, TaskEmail(self.settings['subject'], for email in self.ereader_mail.split(','):
self.results["path"], email = email.strip()
filename, worker_thread.add(self.user, TaskEmail(self.settings['subject'],
self.settings, self.results["path"],
self.ereader_mail, filename,
EmailText, self.settings,
self.settings['body'], email,
id=self.book_id, EmailText,
internal=True) self.settings['body'],
) id=self.book_id,
internal=True)
)
except Exception as ex: except Exception as ex:
return self._handleError(str(ex)) return self._handleError(str(ex))

2
cps/templates/user_edit.html
View File

@ -25,7 +25,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<label for="kindle_mail">{{_('Send to eReader Email')}}</label> <label for="kindle_mail">{{_('Send to eReader Email Address. Use comma to seperate emails for multiple eReaders')}}</label>
<input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}"> <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
</div> </div>
{% if not content.role_anonymous() %} {% if not content.role_anonymous() %}