From e6c6c26fd1ec363c3065f03c388a5d628ed6331e Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Thu, 25 May 2017 09:30:20 +0200
Subject: [PATCH] No error 500 if kindlegen is not excecutable

---
 cps/helper.py | 12 +++++++++---
 cps/web.py    | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 2d5dfa7e..eb898b48 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -86,8 +86,14 @@ def make_mobi(book_id, calibrepath):
 
     file_path = os.path.join(calibrepath, book.path, data.name)
     if os.path.exists(file_path + u".epub"):
-        p = subprocess.Popen((kindlegen + " \"" + file_path + u".epub\"").encode(sys.getfilesystemencoding()),
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        try:
+            p = subprocess.Popen((kindlegen + " \"" + file_path + u".epub\"").encode(sys.getfilesystemencoding()),
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        except:
+            error_message = _(u"kindlegen failed, no excecution permissions")
+            app.logger.error("make_mobi: "+error_message)
+            return error_message, RET_FAIL
+
         # Poll process for new output until finished
         while True:
             nextline = p.stdout.readline()
@@ -117,7 +123,7 @@ def make_mobi(book_id, calibrepath):
             return file_path + ".mobi", RET_SUCCESS
         else:
             app.logger.error("make_mobi: kindlegen failed with error while converting book")
-            return error_message, RET_FAIL
+            return None, RET_FAIL
     else:
         app.logger.error("make_mobi: epub not found: %s.epub" % file_path)
         return None, RET_FAIL
diff --git a/cps/web.py b/cps/web.py
index 1f0897f2..7273e1aa 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1261,13 +1261,16 @@ def stats():
         kindlegen = os.path.join(vendorpath, u"kindlegen")
     versions['KindlegenVersion'] = _('not installed')
     if os.path.exists(kindlegen):
-        p = subprocess.Popen(kindlegen, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        p.wait()
-        for lines in p.stdout.readlines():
-            if isinstance(lines, bytes):
-                lines = lines.decode('utf-8')
-            if re.search('Amazon kindlegen\(', lines):
-                versions['KindlegenVersion'] = lines
+        try:
+            p = subprocess.Popen(kindlegen, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            p.wait()
+            for lines in p.stdout.readlines():
+                if isinstance(lines, bytes):
+                    lines = lines.decode('utf-8')
+                if re.search('Amazon kindlegen\(', lines):
+                    versions['KindlegenVersion'] = lines
+        except:
+            versions['KindlegenVersion'] = _('Excecution permissions missing')
     versions['PythonVersion'] = sys.version
     versions['babel'] = babelVersion
     versions['sqlalchemy'] = sqlalchemyVersion