From d2ad78eb40dc5949ba153b6660eef75d011d5c1e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Jan 2021 11:16:57 +0100
Subject: [PATCH] Added swipe support for comic reader and txt reader (#925)
 Bugfix for txt file not present on serving file

---
 cps/static/js/kthoom.js    |  8 ++++++++
 cps/templates/readcbr.html |  8 ++------
 cps/templates/readtxt.html |  9 +++++++++
 cps/web.py                 | 15 +++++++++------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js
index 33a2ac0e..40db69ab 100644
--- a/cps/static/js/kthoom.js
+++ b/cps/static/js/kthoom.js
@@ -635,6 +635,14 @@ function init(filename) {
     // Focus the scrollable area so that keyboard scrolling work as expected
     $("#mainContent").focus();
 
+    $("#mainContent").swipe( {
+        swipeRight:function() {
+            showLeftPage();
+        },
+        swipeLeft:function() {
+            showRightPage();
+        },
+    });
     $("#mainImage").click(function(evt) {
         // Firefox does not support offsetX/Y so we have to manually calculate
         // where the user clicked in the image.
diff --git a/cps/templates/readcbr.html b/cps/templates/readcbr.html
index 29508fbf..35943b34 100644
--- a/cps/templates/readcbr.html
+++ b/cps/templates/readcbr.html
@@ -13,14 +13,10 @@
   <link rel="stylesheet" href="{{ url_for('static', filename='css/kthoom.css') }}" type="text/css"/>
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
   <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bytestream.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bytebuffer.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bitstream.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/rarvm.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/unrar5.js') }}"></script>
   <script src="{{ url_for('static', filename='js/kthoom.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
   <script>
     var updateArrows = function() {
       if ($('input[name="direction"]:checked').val() === "0") {
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index 46a16d8f..da862fb2 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -12,6 +12,7 @@
         <!-- EPUBJS Renderer -->
         <!--<script src="../build/epub.js"></script>-->
         <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
 
         <style type="text/css">
 
@@ -97,6 +98,14 @@
           $( "#right" ).click(function() {
             nextPage();
           });
+          $("#readmain").swipe( {
+            swipeRight:function() {
+                prevPage();
+            },
+            swipeLeft:function() {
+                nextPage();
+            },
+          });
           //bind mouse
           $(window).bind('DOMMouseScroll mousewheel', function(event) {
             var delta = 0;
diff --git a/cps/web.py b/cps/web.py
index 45e03224..3bff8542 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1198,7 +1198,7 @@ def serve_book(book_id, book_format, anyname):
     book = calibre_db.get_book(book_id)
     data = calibre_db.get_book_format(book_id, book_format.upper())
     if not data:
-        abort(404)
+        return "File not in Database"
     log.info('Serving book: %s', data.name)
     if config.config_use_google_drive:
         headers = Headers()
@@ -1207,11 +1207,14 @@ def serve_book(book_id, book_format, anyname):
         return do_gdrive_download(df, headers, (book_format.upper() == 'TXT'))
     else:
         if book_format.upper() == 'TXT':
-            rawdata = open(os.path.join(config.config_calibre_dir, book.path, data.name + "." + book_format),
-                           "rb").read()
-            result = chardet.detect(rawdata)
-            return make_response(
-                rawdata.decode(result['encoding']).encode('utf-8'))
+            try:
+                rawdata = open(os.path.join(config.config_calibre_dir, book.path, data.name + "." + book_format),
+                               "rb").read()
+                result = chardet.detect(rawdata)
+                return make_response(
+                    rawdata.decode(result['encoding']).encode('utf-8'))
+            except FileNotFoundError:
+                return "File Not Found"
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)