Code cosmetics

Bugfix missing bleach tags (#3080)
Bugfix pdfreader

cps/tasks/convert.py

@@ -44,9 +44,11 @@ log = logger.create()
 
 current_milli_time = lambda: int(round(time() * 1000))
 
+
 class TaskConvert(CalibreTask):
     def __init__(self, file_path, book_id, task_message, settings, ereader_mail, user=None):
         super(TaskConvert, self).__init__(task_message)
+        self.worker_thread = None
         self.file_path = file_path
         self.book_id = book_id
         self.title = ""
@@ -67,12 +69,13 @@ class TaskConvert(CalibreTask):
                                                      data.name + "." + self.settings['old_book_format'].lower())
             df_cover = gdriveutils.getFileFromEbooksFolder(cur_book.path, "cover.jpg")
             if df:
+                datafile_cover = None
                 datafile = os.path.join(config.get_book_path(),
                                         cur_book.path,
                                         data.name + "." + self.settings['old_book_format'].lower())
                 if df_cover:
                     datafile_cover = os.path.join(config.get_book_path(),
-                                            cur_book.path, "cover.jpg")
+                                                  cur_book.path, "cover.jpg")
                 if not os.path.exists(os.path.join(config.get_book_path(), cur_book.path)):
                     os.makedirs(os.path.join(config.get_book_path(), cur_book.path))
                 df.GetContentFile(datafile)
@@ -85,7 +88,7 @@ class TaskConvert(CalibreTask):
                                   format=self.settings['old_book_format'],
                                   fn=data.name + "." + self.settings['old_book_format'].lower())
                 worker_db.session.close()
-                return self._handleError(self, error_message)
+                return self._handleError(error_message)
 
         filename = self._convert_ebook_format()
         if config.config_use_google_drive:
@@ -242,10 +245,11 @@ class TaskConvert(CalibreTask):
                 os.unlink(converted_file[0])
             else:
                 return 1, N_("Converted file not found or more than one file in folder %(folder)s",
-                            folder=os.path.dirname(file_path))
+                             folder=os.path.dirname(file_path))
         return check, None
 
     def _convert_calibre(self, file_path, format_old_ext, format_new_ext, has_cover):
+        path_tmp_opf = None
         try:
             # path_tmp_opf = self._embed_metadata()
             if config.config_embed_metadata:

cps/tasks/database.py

@@ -31,7 +31,6 @@ class TaskReconnectDatabase(CalibreTask):
         self.listen_address = config.get_config_ipaddress()
         self.listen_port = config.config_port
 
-
     def run(self, worker_thread):
         address = self.listen_address if self.listen_address else 'localhost'
         port = self.listen_port if self.listen_port else 8083

cps/tasks/mail.py

@@ -59,7 +59,7 @@ class EmailBase:
         if hasattr(self, 'sock') and self.sock:
             try:
                 if self.transferSize:
-                    lock=threading.Lock()
+                    lock = threading.Lock()
                     lock.acquire()
                     self.transferSize = len(strg)
                     lock.release()

cps/tasks/metadata_backup.py

@@ -25,6 +25,7 @@ from flask_babel import lazy_gettext as N_
 
 from ..epub_helper import create_new_metadata_backup
 
+
 class TaskBackupMetadata(CalibreTask):
 
     def __init__(self, export_language="en",

cps/tasks/thumbnail.py

@@ -110,7 +110,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_books_with_covers(self, book_id=-1):
+    @staticmethod
+    def get_books_with_covers(book_id=-1):
         filter_exp = (db.Books.id == book_id) if book_id != -1 else True
         calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         books_cover = calibre_db.session.query(db.Books).filter(db.Books.has_cover == 1).filter(filter_exp).all()
@@ -464,7 +465,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
                 thumbnails = (calibre_db.session.query(ub.Thumbnail)
                               .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
-                              .filter(db.Books.id == None)
+                              .filter(db.Books.id==None)
                               .all())
                 calibre_db.session.close()
             elif self.book_id > 0:  # make sure single book is selected

cps/tasks/upload.py

@@ -22,6 +22,7 @@ from flask_babel import lazy_gettext as N_
 
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
 
+
 class TaskUpload(CalibreTask):
     def __init__(self, task_message, book_title):
         super(TaskUpload, self).__init__(task_message)