Merge branch 'comic_server' into comic_server

cps/helper.py

@@ -508,3 +508,22 @@ class Updater(threading.Thread):
                     logging.getLogger('cps.web').debug("Could not remove:" + item_path)
         shutil.rmtree(source, ignore_errors=True)
 
+def check_unrar(unrarLocation):
+    error = False
+    if os.path.exists(unrarLocation):
+        try:
+            p = subprocess.Popen(unrarLocation, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            p.wait()
+            for lines in p.stdout.readlines():
+                if isinstance(lines, bytes):
+                    lines = lines.decode('utf-8')
+                value=re.search('UNRAR (.*) freeware', lines)
+                if value:
+                    version = value.group(1)
+        except Exception:
+            error = True
+            version=_(u'Excecution permissions missing')
+    else:
+        version = _(u'Unrar binary file not found')
+        error=True
+    return (error, version)

cps/static/js/kthoom.js

@@ -298,7 +298,6 @@ function loadFromArrayBuffer(ab) {
                 </a> \
             </li>"
         );
-                    //}
     }
     var percentage = (ab.page+1) / (ab.last+1);
     totalImages = ab.last+1;
@@ -339,10 +338,21 @@ function setImage(url) {
         updateScale(true);
         canvas.width = innerWidth - 100;
         canvas.height = 200;
-        x.fillStyle = "red";
+        x.fillStyle = "black";
-        x.font = "50px sans-serif";
+        x.textAlign="center";
+        x.font = "24px sans-serif";
         x.strokeStyle = "black";
-        x.fillText("Loading Page #" + (currentImage + 1), 100, 100);
+        x.fillText("Loading Page #" + (currentImage + 1), innerWidth/2, 100);
+    } else {
+        if (url === "error") {
+            updateScale(true);
+            canvas.width = innerWidth - 100;
+            canvas.height = 200;
+            x.fillStyle = "black";
+            x.textAlign="center";
+            x.font = "24px sans-serif";
+            x.strokeStyle = "black";
+            x.fillText("Unable to decompress image #" + (currentImage + 1), innerWidth/2, 100);
         } else {
             if ($("body").css("scrollHeight") / innerHeight > 1) {
                 $("body").css("overflowY", "scroll");
@@ -353,13 +363,13 @@ function setImage(url) {
                 canvas.width = innerWidth - 100;
                 canvas.height = 300;
                 updateScale(true);
-            x.fillStyle = "orange";
+                x.fillStyle = "black";
                 x.font = "50px sans-serif";
                 x.strokeStyle = "black";
                 x.fillText("Page #" + (currentImage + 1) + " (" +
-              imageFiles[currentImage].filename + ")", 100, 100);
+                  imageFiles[currentImage].filename + ")", innerWidth/2, 100);
-            x.fillStyle = "red";
+                x.fillStyle = "black";
-            x.fillText("Is corrupt or not an image", 100, 200);
+                x.fillText("Is corrupt or not an image", innerWidth/2, 200);
 
                 var xhr = new XMLHttpRequest();
                 if (/(html|htm)$/.test(imageFiles[currentImage].filename)) {
@@ -415,6 +425,7 @@ function setImage(url) {
             };
             img.src = url;
         }
+    }
 }
 
 function showPrevPage() {
@@ -528,6 +539,12 @@ function keyHandler(evt) {
 
 function ImageLoadCallback(event) {
     var jso=this.response;
+    // Unable to decompress file, or no response from server
+    if (jso === null){
+        setImage("error");
+    }
+    else
+    {
         if (jso.page !== jso.last)
         {
             // var secRequest = new XMLHttpRequest();
@@ -541,6 +558,7 @@ function ImageLoadCallback(event) {
             console.log('Transfer done in ' + diff + 's');
         }
         loadFromArrayBuffer(jso);
+    }
 }
 function init(fileid) {
     start = (new Date).getTime();

cps/templates/stats.html

@@ -42,6 +42,10 @@
       <th>Kindlegen</th>
       <td>{{versions['KindlegenVersion']}}</td>
     </tr>
+    <tr>
+      <th>Unrar</th>
+      <td>{{versions['unrarVersion']}}</td>
+    </tr>
     <tr>
       <th>ImageMagick</th>
       <td>{{versions['ImageVersion']}}</td>

cps/web.py

@@ -941,11 +941,11 @@ def get_comic_book(book_id, book_format, page):
                             extractedfile="data:image/png;base64," + b64
                             fileData={"name": rarNames[page],"page":page, "last":rarNames.__len__()-1, "content": extractedfile}
                         except:
-                            return ""
                             # rarfile not valid
-                            # ToDo: error handling
+                            app.logger.error('Unrar binary not found unable to decompress file ' + cbr_file)
+                            return ""
                     else:
-
+                        app.logger.info('Unrar is not supported please install python rarfile extension')
                         # no support means return nothing
                         return ""
                 if book_format == "cbz":
@@ -1523,7 +1523,13 @@ def stats():
     versions['requests'] = requests.__version__
     versions['pysqlite'] = db.engine.dialect.dbapi.version
     versions['sqlite'] = db.engine.dialect.dbapi.sqlite_version
-
+    if rar_support:
+        rarVersion = helper.check_unrar(config.config_rarfile_location)
+        if not rarVersion[0]:
+            versions['unrarVersion'] = rarVersion[1]
+        else:
+            versions['unrarVersion'] = _('not installed')
+            app.logger.info(rarVersion[1])
     return render_title_template('stats.html', bookcounter=counter, authorcounter=authors, versions=versions,
                                  categorycounter=categorys, seriecounter=series, title=_(u"Statistics"))
 
@@ -2551,8 +2557,14 @@ def configuration_helper(origin):
         # Rarfile Content configuration
         # ToDo check: location valid
         if "config_rarfile_location" in to_save:
+            check = helper.check_unrar(to_save["config_rarfile_location"].strip())
+            if not check[0] :
                 content.config_rarfile_location = to_save["config_rarfile_location"].strip()
-
+            else:
+                flash(check[1], category="error")
+                return render_title_template("config_edit.html", content=config, origin=origin, gdrive=gdrive_support,
+                                         goodreads=goodreads_support, rarfile_support=rar_support,
+                                         title=_(u"Basic Configuration"))
 
         content.config_default_role = 0
         if "admin_role" in to_save: