From cf00b4eebfa33c09a35b1cfaa5b40a3dc18fd074 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 24 Jul 2019 18:15:38 +0200
Subject: [PATCH] Cover upload gives Error 500 fix #972 (leftover from
 refactoring) OPDS cannot be downloaded Fix #973 (wrong blueprint selected
 with wrong authentication type) Read books with link to calibre wern't
 detected correct Fix #971 (Refactoring error "is" is not equal to "==" for
 sqlalchemy)

---
 cps/helper.py          | 2 +-
 cps/templates/feed.xml | 2 +-
 cps/templates/json.txt | 4 ++--
 cps/web.py             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index f2fe7572..b85a6de7 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -509,7 +509,7 @@ def save_cover(img, book_path):
             log.error("Only jpg/jpeg files are supported as coverfile")
             return False
 
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         tmpDir = gettempdir()
         if save_cover_from_filestorage(tmpDir, "uploaded_cover.jpg", img) is True:
             gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg'),
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index e007f71f..473dc2d4 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -65,7 +65,7 @@
     <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
     {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower)}}"
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
           length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
diff --git a/cps/templates/json.txt b/cps/templates/json.txt
index 5f8dffca..db8981d2 100644
--- a/cps/templates/json.txt
+++ b/cps/templates/json.txt
@@ -36,7 +36,7 @@
   "timestamp": "{{entry.timestamp}}",
   "thumbnail": "{{url_for('opds.feed_get_cover', book_id=entry.id)}}",
   "main_format": {
-    "{{entry.data[0].format|lower}}": "{{ url_for('web.download_link', book_id=entry.id, book_format=entry.data[0].format|lower)}}"
+    "{{entry.data[0].format|lower}}": "{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=entry.data[0].format|lower)}}"
   },
   "rating":{% if entry.ratings.__len__() > 0 %} "{{entry.ratings[0].rating}}.0"{% else %}0.0{% endif %},
   "authors": [
@@ -47,7 +47,7 @@
   "other_formats": {
   {% if entry.data.__len__() > 1 %}
   {% for format in entry.data[1:] %}
-    "{{format.format|lower}}": "{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower)}}"{% if not loop.last %},{% endif %}
+    "{{format.format|lower}}": "{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"{% if not loop.last %},{% endif %}
   {% endfor %}
   {% endif %} },
   "title_sort": "{{entry.sort}}"
diff --git a/cps/web.py b/cps/web.py
index 7529218b..4529286f 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -947,7 +947,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
     else:
         try:
             readBooks = db.session.query(db.cc_classes[config.config_read_column])\
-                .filter(db.cc_classes[config.config_read_column].value is True).all()
+                .filter(db.cc_classes[config.config_read_column].value == True).all()
             readBookIds = [x.book for x in readBooks]
         except KeyError:
             log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)