From bbe91f439a3389308f4125e39eef4b45cac78073 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 22 Dec 2019 15:28:43 +0100
Subject: [PATCH] Merge from master

---
 cps/static/css/kthoom.css      | 33 -----------------------
 cps/static/css/listen.css      | 24 +----------------
 cps/static/css/main.css        | 23 ++++++++--------
 cps/static/js/archive/rarvm.js | 12 +++++++--
 cps/static/js/reading/epub.js  |  5 +++-
 cps/templates/readtxt.html     | 49 +++++++---------------------------
 cps/ub.py                      |  2 +-
 7 files changed, 36 insertions(+), 112 deletions(-)

diff --git a/cps/static/css/kthoom.css b/cps/static/css/kthoom.css
index 6dfb9967..d7668156 100644
--- a/cps/static/css/kthoom.css
+++ b/cps/static/css/kthoom.css
@@ -152,39 +152,6 @@ body {
   max-width: 70%;
 }
 
-#left {
-  left: 40px;
-}
-
-#right {
-  right: 40px;
-}
-
-.arrow {
-  position: absolute;
-  top: 50%;
-  margin-top: -32px;
-  font-size: 64px;
-  color: #E2E2E2;
-  font-family: arial, sans-serif;
-  font-weight: bold;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.arrow:hover {
-  color: #777;
-}
-
-.arrow:active,
-.arrow.active {
-  color: #000;
-}
-
 th, td {
   padding: 5px;
 }
diff --git a/cps/static/css/listen.css b/cps/static/css/listen.css
index b08cc33c..0e34d163 100644
--- a/cps/static/css/listen.css
+++ b/cps/static/css/listen.css
@@ -65,28 +65,6 @@
     right: 40px;
   }
 
-  .arrow {
-    position: absolute;
-    top: 50%;
-    margin-top: -32px;
-    font-size: 64px;
-    color: #E2E2E2;
-    font-family: arial, sans-serif;
-    font-weight: bold;
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
-  }
-
-  .arrow:hover {
-    color: #777;
-  }
-
-  .arrow:active {
-    color: #000;
-  }
-
   xmp,
   pre,
   plaintext {
@@ -111,4 +89,4 @@
     -moz-column-gap: 20px;
     -webkit-column-gap: 20px;
     position: relative;
-  }
\ No newline at end of file
+  }
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index 4afb28f7..95a1b5c6 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -15,16 +15,10 @@ body {
 }
 
 #main {
-  /* height: 500px; */
   position: absolute;
   width: 100%;
   height: 100%;
   right: 0;
-  /* left: 40px; */
-/*   -webkit-transform: translate(40px, 0);
-  -moz-transform: translate(40px, 0); */
-
-  /* border-radius: 5px 0px 0px 5px; */
   border-radius: 5px;
   background: #fff;
   overflow: hidden;
@@ -114,18 +108,20 @@ body {
   border: none;
 }
 
-#prev {
+#left,#prev {
   left: 40px;
+  padding-right:80px;
 }
 
-#next {
+#right,#next {
   right: 40px;
+  padding-left:80px;
 }
 
 .arrow {
   position: absolute;
   top: 50%;
-  margin-top: -32px;
+  margin-top: -192px;
   font-size: 64px;
   color: #E2E2E2;
   font-family: arial, sans-serif;
@@ -136,6 +132,9 @@ body {
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  padding-top: 160px;
+  padding-bottom: 160px;
+  padding-right: 80px;
 }
 
 .arrow:hover {
@@ -753,9 +752,9 @@ input:-ms-placeholder {
     }
 }*/
 
-@media only screen 
-and (min-device-width : 768px) 
-and (max-device-width : 1024px) 
+@media only screen
+and (min-device-width : 768px)
+and (max-device-width : 1024px)
 and (orientation : landscape)
 /*and (-webkit-min-device-pixel-ratio: 2)*/ {
   #viewer{
diff --git a/cps/static/js/archive/rarvm.js b/cps/static/js/archive/rarvm.js
index 44e09330..8858fa05 100644
--- a/cps/static/js/archive/rarvm.js
+++ b/cps/static/js/archive/rarvm.js
@@ -9,10 +9,18 @@
 /**
  * CRC Implementation.
  */
-/* global Uint8Array, Uint32Array, bitjs, DataView */
+/* global Uint8Array, Uint32Array, bitjs, DataView, mem */
 /* exported MAXWINMASK, UnpackFilter */
 
-var CRCTab = new Array(256).fill(0);
+function emptyArr(n, v) {
+    var arr = [];
+    for (var i = 0; i < n; i += 1) {
+        arr[i] = v;
+    }
+    return arr;
+}
+
+var CRCTab = emptyArr(256, 0);
 
 function initCRC() {
     for (var i = 0; i < 256; ++i) {
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index 169c207f..bae9f72b 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -1,12 +1,14 @@
 /* global $, calibre, EPUBJS, ePubReader */
 
+var reader;
+
 (function() {
     "use strict";
 
     EPUBJS.filePath = calibre.filePath;
     EPUBJS.cssPath = calibre.cssPath;
 
-    var reader = ePubReader(calibre.bookUrl, {
+    reader = ePubReader(calibre.bookUrl, {
         restore: true,
         bookmarks: calibre.bookmark ? [calibre.bookmark] : []
     });
@@ -40,4 +42,5 @@
             alert(error);
         });
     }
+    // reader.book.package.metadata.direction= "rtl"; wait for reader reader before changing reading direction
 })();
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index 316878f9..46a16d8f 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -7,7 +7,7 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">
         <meta name="apple-mobile-web-app-capable" content="yes">
-
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}" type="text/css"/>
 
         <!-- EPUBJS Renderer -->
         <!--<script src="../build/epub.js"></script>-->
@@ -16,10 +16,10 @@
         <style type="text/css">
 
           body {
-            overflow: hidden;
+            background: white;
           }
 
-          #main {
+          #readmain {
             position: absolute;
             width: 100%;
             height: 100%;
@@ -36,35 +36,6 @@
             border: none;
           }
 
-          #prev {
-            left: 40px;
-          }
-
-          #next {
-            right: 40px;
-          }
-
-          .arrow {
-            position: absolute;
-            top: 50%;
-            margin-top: -32px;
-            font-size: 64px;
-            color: #E2E2E2;
-            font-family: arial, sans-serif;
-            font-weight: bold;
-            cursor: pointer;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            user-select: none;
-          }
-
-          .arrow:hover {
-            color: #777;
-          }
-
-          .arrow:active {
-            color: #000;
-          }
           xmp, pre, plaintext {
             display: block;
             font-family: -moz-fixed;
@@ -90,16 +61,13 @@
 
          <script>
             "use strict";
-
-            //var Book = ePub("https://s3.amazonaws.com/moby-dick/");
-
         </script>
     </head>
     <body>
-        <div id="main">
-          <div id="prev" class="arrow" >‹</div>
+        <div id="readmain">
+          <div id="left" class="arrow" >‹</div>
           <div id="area"><pre id="content" class="content"></pre></div>
-          <div id="next" class="arrow">›</div>
+          <div id="right" class="arrow">›</div>
         </div>
 
         <script>
@@ -123,10 +91,10 @@
             }
           });
           //click
-          $( "#prev" ).click(function() {
+          $( "#left" ).click(function() {
             prevPage();
           });
-          $( "#next" ).click(function() {
+          $( "#right" ).click(function() {
             nextPage();
           });
           //bind mouse
@@ -156,6 +124,7 @@
           function nextPage(){
             leftoff = $("#content").offset().left;
             leftoff = leftoff-origwidth-gap;
+            if ( leftoff + $("#content")[0].scrollWidth < 0) { return;}
             $("#content").offset({left:leftoff});
           }
         });
diff --git a/cps/ub.py b/cps/ub.py
index 138fd022..cf5d090c 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -307,7 +307,7 @@ class RemoteAuthToken(Base):
     __tablename__ = 'remote_auth_token'
 
     id = Column(Integer, primary_key=True)
-    auth_token = Column(String, unique=True)
+    auth_token = Column(String, unique=True)        # IMPORTANT: ToDo:check length restríction id not valid for string
     user_id = Column(Integer, ForeignKey('user.id'))
     verified = Column(Boolean, default=False)
     expiration = Column(DateTime)