Merge branch 'master' into Develop

cps/templates/author.html

@@ -29,7 +29,7 @@
       <div class="cover">
         <a href="{{ url_for('show_book', book_id=entry.id) }}">
           {% if entry.has_cover %}
-          <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" />
+          <img src="{{ url_for('get_cover', book_id=entry.id) }}" />
           {% else %}
           <img src="{{ url_for('static', filename='generic_cover.jpg') }}" />
           {% endif %}

cps/templates/book_edit.html

@@ -6,7 +6,7 @@
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
       {% if book.has_cover %}
-        <img src="{{ url_for('get_cover', cover_path=book.path.replace('\\','/')) }}" alt="{{ book.title }}"/>
+        <img src="{{ url_for('get_cover', book_id=book.id) }}" alt="{{ book.title }}"/>
       {% else %}
         <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ book.title }}"/>
       {% endif %}

cps/templates/detail.html

@@ -5,7 +5,7 @@
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
         {% if entry.has_cover %}
-          <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}" />
+          <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
         {% else %}
           <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
         {% endif %}

cps/templates/discover.html

@@ -9,7 +9,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}" />
+            <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
           </a>
         {% endif %}
       </div>

cps/templates/index.html

@@ -10,7 +10,7 @@
       <div class="cover">
           <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             {% if entry.has_cover %}
-              <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}" />
+              <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
             {% else %}
               <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
             {% endif %}
@@ -55,7 +55,7 @@
       <div class="cover">
           <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             {% if entry.has_cover %}
-              <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}"/>
+              <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
             {% else %}
               <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
             {% endif %}

cps/templates/search.html

@@ -36,7 +36,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}" />
+            <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
           </a>
         {% endif %}
       </div>

cps/templates/shelf.html

@@ -19,7 +19,7 @@
       <div class="cover">
             <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             {% if entry.has_cover %}
-              <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="{{ entry.title }}" />
+              <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
             {% else %}
               <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
             {% endif %}

cps/templates/user_edit.html

@@ -172,7 +172,7 @@
     {% for entry in downloads %}
       <div class="col-sm-2">
         <a class="pull-left" href="{{ url_for('show_book', book_id=entry.id) }}">
-          <img class="media-object" width="100" src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" alt="...">
+          <img class="media-object" width="100" src="{{ url_for('get_cover', book_id=entry.id) }}" alt="...">
         </a>
       </div>
     {% endfor %}

cps/web.py

@@ -2079,10 +2079,11 @@ def advanced_search():
                                  series=series, title=_(u"search"), cc=cc, page="advsearch")
 
 
-@app.route("/cover/<path:cover_path>")
+@app.route("/cover/<book_id>")
 @login_required_if_no_ano
-def get_cover(cover_path):
+def get_cover(book_id):
-    return helper.get_book_cover(cover_path)
+    book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
+    return helper.get_book_cover(book.path)
 
 
 @app.route("/show/<book_id>/<book_format>")
@@ -2104,10 +2105,10 @@ def serve_book(book_id, book_format):
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
-@app.route("/opds/thumb_240_240/<path:book_id>")
+@app.route("/opds/thumb_240_240/<book_id>")
-@app.route("/opds/cover_240_240/<path:book_id>")
+@app.route("/opds/cover_240_240/<book_id>")
-@app.route("/opds/cover_90_90/<path:book_id>")
+@app.route("/opds/cover_90_90/<book_id>")
-@app.route("/opds/cover/<path:book_id>")
+@app.route("/opds/cover/<book_id>")
 @requires_basic_auth_if_no_ano
 def feed_get_cover(book_id):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()