From a42ebdc0962ce604e14f4b43623e772440451606 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 7 May 2019 19:54:13 +0200
Subject: [PATCH] Fix for #897

---
 cps/helper.py              | 2 +-
 cps/templates/readpdf.html | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index c11c6909..e5874822 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -177,7 +177,7 @@ def check_send_to_kindle(entry):
 # Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 # list with supported formats
 def check_read_formats(entry):
-    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'ZIP', 'CBZ', 'TAR', 'CBT', 'RAR', 'CBR'}
+    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR'}
     bookformats = list()
     if len(entry.data):
         for ele in iter(entry.data):
diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
index 5f59a062..a49576f2 100644
--- a/cps/templates/readpdf.html
+++ b/cps/templates/readpdf.html
@@ -34,20 +34,18 @@ See https://github.com/adobe-type-tools/cmap-resources
     <script src="{{ url_for('static', filename='js/libs/compatibility.js') }}"></script>
 
     <!-- This snippet is used in production (included from viewer.html) -->
-    <link rel="resource" type="application/l10n" href="{{ url_for('static', filename='locale/locale.properties') }}">
     <script src="{{ url_for('static', filename='js/libs/pdf.js') }}"></script>
 
     <script type="text/javascript">
 
     window.addEventListener('load', function() {
+        PDFViewerApplicationOptions.set('sidebarViewOnLoad', 0);
         PDFViewerApplicationOptions.set('imageResourcesPath', "{{ url_for('static', filename='css/images/') }}");
         PDFViewerApplicationOptions.set('workerSrc', "{{ url_for('static', filename='js/libs/pdf.worker.js') }}");
-        PDFViewerApplicationOptions.set('sidebarViewOnLoad', 0);
-        // PDFViewerApplication.open("{{ url_for('serve_book', book_id=pdffile, book_format='pdf') }}");
-        PDFViewerApplicationOptions.set('defaultUrl', "{{ url_for('serve_book', book_id=pdffile, book_format='pdf') }}");
+        PDFViewerApplication.open("{{ url_for('serve_book', book_id=pdffile, book_format='pdf') }}");
     });
     </script>
-
+    <link rel="resource" type="application/l10n" href="{{ url_for('static', filename='locale/locale.properties') }}">
     <script src="{{ url_for('static', filename='js/libs/viewer.js') }}"></script>
 
   </head>