From cb0d9ec95cbde06c20692ea133820413947c65e8 Mon Sep 17 00:00:00 2001
From: gjutras <g@jutras.net>
Date: Mon, 28 Mar 2022 19:59:59 -0400
Subject: [PATCH] Allow kindle_email to be CSV to allow sending to multiple
 kindles

---
 cps/helper.py                | 33 +++++++++++++++++++--------------
 cps/tasks/convert.py         | 18 ++++++++++--------
 cps/templates/user_edit.html |  2 +-
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 4928d388..ddaf507f 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -109,9 +109,11 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
 
 
 def send_test_mail(kindle_mail, user_name):
-    WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), kindle_mail, _(u"Test e-mail"),
-                                          _(u'This e-mail has been sent via Calibre-Web.')))
+    for email in kindle_mail.split(','):
+        email = email.strip()
+        WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
+                         config.get_mail_settings(), email, _(u"Test e-mail"),
+                                              _(u'This e-mail has been sent via Calibre-Web.')))
     return
 
 
@@ -217,9 +219,11 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
             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))
             email_text = _(u"%(book)s send to Kindle", book=link)
-            WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
-                             config.get_mail_settings(), kindle_mail,
-                             email_text, _(u'This e-mail has been sent via Calibre-Web.')))
+            for email in kindle_mail.split(','):
+                email = email.strip()
+                WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
+                                 config.get_mail_settings(), email,
+                                 email_text, _(u'This e-mail has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
@@ -644,14 +648,15 @@ def check_username(username):
     return username
 
 
-def valid_email(email):
-    email = email.strip()
-    # Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
-    if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$",
-                     email):
-        log.error(u"Invalid e-mail address format")
-        raise Exception(_(u"Invalid e-mail address format"))
-    return email
+def valid_email(emails):
+    for email in emails.split(','):
+        email = email.strip()
+        # Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
+        if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$",
+                         email):
+            log.error(u"Invalid e-mail address format")
+            raise Exception(_(u"Invalid e-mail address format"))
+    return emails
 
 # ################################# External interface #################################
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 98cd7b48..a67edaf8 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -90,14 +90,16 @@ class TaskConvert(CalibreTask):
                 # todo: figure out how to incorporate this into the progress
                 try:
                     EmailText = _(u"%(book)s send to Kindle", book=escape(self.title))
-                    worker_thread.add(self.user, TaskEmail(self.settings['subject'],
-                                                           self.results["path"],
-                                                           filename,
-                                                           self.settings,
-                                                           self.kindle_mail,
-                                                           EmailText,
-                                                           self.settings['body'],
-                                                           internal=True)
+                    for email in self.kindle_mail.split(','):
+                        email = email.strip()
+                        worker_thread.add(self.user, TaskEmail(self.settings['subject'],
+                                                               self.results["path"],
+                                                               filename,
+                                                               self.settings,
+                                                               email,
+                                                               EmailText,
+                                                               self.settings['body'],
+                                                               internal=True)
                                       )
                 except Exception as ex:
                     return self._handleError(str(ex))
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index b489cbaf..b5f7f333 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -25,7 +25,7 @@
         </div>
     {% endif %}
     <div class="form-group">
-      <label for="kindle_mail">{{_('Send to Kindle E-mail Address')}}</label>
+      <label for="kindle_mail">{{_('Send to Kindle E-mail Address. Use comma to seperate emails for multiple kindles.')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
     {% if not content.role_anonymous() %}