From d01d7b91a8be744bf35e820795709c97ab7c8654 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Tue, 27 Mar 2018 20:42:19 +0200
Subject: [PATCH] Added error messages in log and UI if cover url can't
 downloaded, changed label for cover URL to clarify function #449

---
 cps/templates/book_edit.html |  2 +-
 cps/web.py                   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 0276ad3f..49d41742 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -48,7 +48,7 @@
       <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
     </div>
     <div class="form-group">
-      <label for="cover_url">{{_('Cover URL (jpg)')}}</label>
+      <label for="cover_url">{{_('Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)')}}</label>
       <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
     </div>
 
diff --git a/cps/web.py b/cps/web.py
index a74f5f91..d13ff921 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -3002,8 +3002,11 @@ def edit_book(book_id):
         updateGdriveCalibreFromLocal()
 
     if not error:
-        if to_save["cover_url"] and save_cover(to_save["cover_url"], book.path):
-            book.has_cover = 1
+        if to_save["cover_url"]:
+            if save_cover(to_save["cover_url"], book.path) is true:
+                book.has_cover = 1
+            else:
+                flash(_(u"Cover is not a jpg file, can't save"), category="error")
 
         if book.series_index != to_save["series_index"]:
             book.series_index = to_save["series_index"]
@@ -3155,6 +3158,7 @@ def edit_book(book_id):
 def save_cover(url, book_path):
     img = requests.get(url)
     if img.headers.get('content-type') != 'image/jpeg':
+        app.logger.error("Cover is no jpg file, can't save")
         return false
 
     if config.config_use_google_drive:
@@ -3163,11 +3167,13 @@ def save_cover(url, book_path):
         f.write(img.content)
         f.close()
         gdriveutils.uploadFileToEbooksFolder(Gdrive.Instance().drive, os.path.join(book_path, 'cover.jpg'), os.path.join(tmpDir, f.name))
+        app.logger.info("Cover is saved on gdrive")
         return true
 
     f = open(os.path.join(config.config_calibre_dir, book_path, "cover.jpg"), "wb")
     f.write(img.content)
     f.close()
+    app.logger.info("Cover is saved")
     return true