From 560ade00b40e7d61cfdf66d071dd6152ee2347af Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Nov 2020 10:03:10 +0100
Subject: [PATCH] Fix browser caching problem on change cover

---
 cps/jinjia.py                |  6 ++++++
 cps/templates/book_edit.html |  2 +-
 cps/templates/detail.html    |  6 +++---
 cps/web.py                   | 15 ++++++++++++---
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/cps/jinjia.py b/cps/jinjia.py
index ebb53a30..688d1fba 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -25,6 +25,7 @@
 from __future__ import division, print_function, unicode_literals
 import datetime
 import mimetypes
+from uuid import uuid4
 
 from babel.dates import format_date
 from flask import Blueprint, request, url_for
@@ -127,3 +128,8 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+@jinjia.app_template_filter('uuidfilter')
+def uuidfilter(var):
+    return uuid4()
+
+
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 16c02fae..003b33f9 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -3,7 +3,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        <img src="{{ url_for('web.get_cover', book_id=book.id) }}" alt="{{ book.title }}"/>
+        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 260ee93a..503d1dbd 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,13 +4,13 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
-          {% if g.user.role_download() %}
+          {% if g.user.role_download() %}
             {% if entry.data|length %}
             <div class="btn-group" role="group">
                 {% if entry.data|length < 2 %}
@@ -278,7 +278,7 @@
       {% endif %}
 
       {% endif %}
-      {% if g.user.role_edit() %}
+      {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
           <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
diff --git a/cps/web.py b/cps/web.py
index a5844f69..38f2e044 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1922,9 +1922,18 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
-        return render_title_template('detail.html', entry=entries, audioentries=audioentries, cc=cc,
-                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest', title=entries.title, books_shelfs=book_in_shelfs,
-                                     have_read=have_read, is_archived=is_archived, kindle_list=kindle_list, reader_list=reader_list, page="book")
+        return render_title_template('detail.html',
+                                     entry=entries,
+                                     audioentries=audioentries,
+                                     cc=cc,
+                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest',
+                                     title=entries.title,
+                                     books_shelfs=book_in_shelfs,
+                                     have_read=have_read,
+                                     is_archived=is_archived,
+                                     kindle_list=kindle_list,
+                                     reader_list=reader_list,
+                                     page="book")
     else:
         log.debug(u"Error opening eBook. File does not exist or file is not accessible")
         flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")