Merge branch 'janeczku-master'

# Conflicts: # cps/helper.py # cps/tasks/convert.py # cps/templates/user_edit.html
2022-07-08 16:42:14 -04:00
parent 07c67b09db cb0d9ec95c
commit 0a7345186d
3 changed files with 30 additions and 23 deletions
@@ -90,14 +90,16 @@ class TaskConvert(CalibreTask):
                # todo: figure out how to incorporate this into the progress
                try:
                    EmailText = N_(u"%(book)s send to E-Reader", book=escape(self.title))
-                    worker_thread.add(self.user, TaskEmail(self.settings['subject'],
-                                                           self.results["path"],
-                                                           filename,
-                                                           self.settings,
-                                                           self.ereader_mail,
-                                                           EmailText,
-                                                           self.settings['body'],
-                                                           internal=True)
+                    for email in self.ereader_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))