Fixed several text problems from tasks

Fixed task update

cps/tasks/convert.py

@@ -5,6 +5,7 @@ import re
 
 from glob import glob
 from shutil import copyfile
+from markupsafe import escape
 
 from sqlalchemy.exc import SQLAlchemyError
 
@@ -13,6 +14,7 @@ from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
+from flask import url_for
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -24,6 +26,7 @@ class TaskConvert(CalibreTask):
         super(TaskConvert, self).__init__(taskMessage)
         self.file_path = file_path
         self.bookid = bookid
+        self.title = ""
         self.settings = settings
         self.kindle_mail = kindle_mail
         self.user = user
@@ -35,6 +38,7 @@ class TaskConvert(CalibreTask):
         if config.config_use_google_drive:
             worker_db = db.CalibreDB(expire_on_commit=False)
             cur_book = worker_db.get_book(self.bookid)
+            self.title = cur_book.title
             data = worker_db.get_book_format(self.bookid, self.settings['old_book_format'])
             df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
                                                      data.name + "." + self.settings['old_book_format'].lower())
@@ -66,12 +70,13 @@ class TaskConvert(CalibreTask):
                 # if we're sending to kindle after converting, create a one-off task and run it immediately
                 # 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,
-                                                           self.settings['subject'],
+                                                           EmailText,
                                                            self.settings['body'],
                                                            internal=True)
                                       )
@@ -93,8 +98,9 @@ class TaskConvert(CalibreTask):
             local_db.get_book_format(self.bookid, self.settings['new_book_format']):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
             cur_book = local_db.get_book(book_id)
+            self.title = cur_book.title
             self.results['path'] = file_path
-            self.results['title'] = cur_book.title
+            self.results['title'] = self.title
             self._handleSuccess()
             local_db.session.close()
             return os.path.basename(file_path + format_new_ext)
@@ -130,7 +136,8 @@ class TaskConvert(CalibreTask):
                     local_db.session.close()
                     return
                 self.results['path'] = cur_book.path
-                self.results['title'] = cur_book.title
+                self.title = cur_book.title
+                self.results['title'] = self.title
                 if not config.config_use_google_drive:
                     self._handleSuccess()
                 return os.path.basename(file_path + format_new_ext)

cps/tasks/mail.py

@@ -143,7 +143,7 @@ class TaskEmail(CalibreTask):
                 self.send_gmail_email(msg)
         except MemoryError as e:
             log.debug_or_exception(e)
-            self._handleError(u'MemoryError sending email: {}'.format(str(e)))
+            self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
             log.debug_or_exception(e)
             if hasattr(e, "smtp_error"):
@@ -154,13 +154,13 @@ class TaskEmail(CalibreTask):
                 text = '\n'.join(e.args)
             else:
                 text = ''
-            self._handleError(u'Smtplib Error sending email: {}'.format(text))
+            self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
         except socket.error as e:
             log.debug_or_exception(e)
-            self._handleError(u'Socket Error sending email: {}'.format(e.strerror))
+            self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
             log.debug_or_exception(ex)
-            self._handleError(u'Error sending email: {}'.format(ex))
+            self._handleError(u'Error sending e-mail: {}'.format(ex))
 
 
     def send_standard_email(self, msg):
@@ -173,7 +173,7 @@ class TaskEmail(CalibreTask):
             org_smtpstderr = smtplib.stderr
             smtplib.stderr = logger.StderrLogger('worker.smtp')
 
-        log.debug("Start sending email")
+        log.debug("Start sending e-mail")
         if use_ssl == 2:
             self.asyncSMTP = EmailSSL(self.settings["mail_server"], self.settings["mail_port"],
                                        timeout=timeout)
@@ -196,7 +196,7 @@ class TaskEmail(CalibreTask):
         self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipent, fp.getvalue())
         self.asyncSMTP.quit()
         self._handleSuccess()
-        log.debug("Email send successfully")
+        log.debug("E-mail send successfully")
 
         if sys.version_info < (3, 0):
             smtplib.stderr = org_smtpstderr
@@ -258,7 +258,7 @@ class TaskEmail(CalibreTask):
 
     @property
     def name(self):
-        return "Email"
+        return "E-mail"
 
     def __str__(self):
         return "{}, {}".format(self.name, self.subject)