changes for #77

Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail

cps/book_formats.py

@@ -1,18 +1,22 @@
-__author__ = 'lemmsh'
-
 import logging
-logger = logging.getLogger("book_formats")
-
 import uploader
 import os
+from flask_babel import gettext as _
+
+__author__ = 'lemmsh'
+
+logger = logging.getLogger("book_formats")
+
 try:
     from wand.image import Image
+    from wand import version as ImageVersion
     use_generic_pdf_cover = False
 except ImportError, e:
     logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e)
     use_generic_pdf_cover = True
 try:
     from PyPDF2 import PdfFileReader
+    from PyPDF2 import __version__ as PyPdfVersion
     use_pdf_meta = True
 except ImportError, e:
     logger.warning('cannot import PyPDF2, extracting pdf metadata will not work: %s', e)
@@ -37,9 +41,9 @@ def process(tmp_file_path, original_file_name, original_file_extension):
     try:
         if ".PDF" == original_file_extension.upper():
             return pdf_meta(tmp_file_path, original_file_name, original_file_extension)
-        if ".EPUB" == original_file_extension.upper() and use_epub_meta == True:
+        if ".EPUB" == original_file_extension.upper() and use_epub_meta is True:
             return epub.get_epub_info(tmp_file_path, original_file_name, original_file_extension)
-        if ".FB2" == original_file_extension.upper() and use_fb2_meta == True:
+        if ".FB2" == original_file_extension.upper() and use_fb2_meta is True:
             return fb2.get_fb2_info(tmp_file_path, original_file_name, original_file_extension)
     except Exception, e:
         logger.warning('cannot parse metadata, using default: %s', e)
@@ -47,29 +51,28 @@ def process(tmp_file_path, original_file_name, original_file_extension):
     return default_meta(tmp_file_path, original_file_name, original_file_extension)
 
 
-
 def default_meta(tmp_file_path, original_file_name, original_file_extension):
     return uploader.BookMeta(
-        file_path = tmp_file_path,
-        extension = original_file_extension,
-        title = original_file_name,
-        author = "Unknown",
-        cover = None,
-        description = "",
-        tags = "",
-        series = "",
+        file_path=tmp_file_path,
+        extension=original_file_extension,
+        title=original_file_name,
+        author="Unknown",
+        cover=None,
+        description="",
+        tags="",
+        series="",
         series_id="")
 
 
 def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
 
-    if (use_pdf_meta):
+    if use_pdf_meta:
         pdf = PdfFileReader(open(tmp_file_path, 'rb'))
         doc_info = pdf.getDocumentInfo()
     else:
         doc_info = None
 
-    if (doc_info is not None):
+    if doc_info is not None:
         author = doc_info.author if doc_info.author is not None else "Unknown"
         title = doc_info.title if doc_info.title is not None else original_file_name
         subject = doc_info.subject
@@ -78,16 +81,17 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         title = original_file_name
         subject = ""
     return uploader.BookMeta(
-        file_path = tmp_file_path,
-        extension = original_file_extension,
-        title = title,
-        author = author,
-        cover = pdf_preview(tmp_file_path, original_file_name),
-        description = subject,
-        tags = "",
-        series = "",
+        file_path=tmp_file_path,
+        extension=original_file_extension,
+        title=title,
+        author=author,
+        cover=pdf_preview(tmp_file_path, original_file_name),
+        description=subject,
+        tags="",
+        series="",
         series_id="")
 
+
 def pdf_preview(tmp_file_path, tmp_dir):
     if use_generic_pdf_cover:
         return None
@@ -97,3 +101,14 @@ def pdf_preview(tmp_file_path, tmp_dir):
             img.compression_quality = 88
             img.save(filename=os.path.join(tmp_dir, cover_file_name))
         return cover_file_name
+
+def get_versions():
+    if not use_generic_pdf_cover:
+        IVersion=ImageVersion.MAGICK_VERSION
+    else:
+        IVersion=_('not installed')
+    if use_pdf_meta:
+        PVersion=PyPdfVersion
+    else:
+        PVersion=_('not installed')
+    return {'ImageVersion':IVersion,'PyPdfVersion':PVersion}