NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cosmetics

Browse Source
This commit is contained in:
OzzieIsaacs 2017-09-17 15:33:22 +02:00
parent a159bb0b97
commit 34e9ef35f5
5 changed files with 142 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
cps/static/js/kthoom.js
View File

@ -16,28 +16,22 @@
*/ */
if (!window.console) {
window.console = {};
window.console.log = function(str) {};
window.console.dir = function(str) {};
}
if (window.opera) { if (window.opera) {
window.console.log = function(str) {opera.postError(str);}; window.console.log = function(str) {opera.postError(str);};
window.console.dir = function(str) {};
} }
// gets the element with the given id // gets the element with the given id
function getElem(id) { function getElem(id) {
if (document.documentElement.querySelector) { if (document.documentElement.querySelector) {
// querySelector lookup // querySelector lookup
return document.body.querySelector('#' + id); return document.body.querySelector("#" + id);
} }
// getElementById lookup // getElementById lookup
return document.getElementById(id); return document.getElementById(id);
} }
if (window.kthoom == undefined) { if (window.kthoom === undefined) {
window.kthoom = {}; var kthoom = {};
} }
// key codes // key codes
@ -90,6 +84,7 @@ kthoom.loadSettings = function() {
vflip = s.vflip; vflip = s.vflip;
fitMode = s.fitMode; fitMode = s.fitMode;
} catch (err) { } catch (err) {
alert("Error load settings");
} }
} }
@ -99,38 +94,38 @@ kthoom.loadSettings = function() {
// This would save 25% on memory since base64-encoded strings are 4/3 the size of the binary // This would save 25% on memory since base64-encoded strings are 4/3 the size of the binary
kthoom.ImageFile = function(file) { kthoom.ImageFile = function(file) {
this.filename = file.filename; this.filename = file.filename;
var fileExtension = file.filename.split('.').pop().toLowerCase(); var fileExtension = file.filename.split(".").pop().toLowerCase();
var mimeType = fileExtension == 'png' ? 'image/png' : var mimeType = fileExtension =="png" ? "image/png" :
(fileExtension == 'jpg' || fileExtension == 'jpeg') ? 'image/jpeg' : (fileExtension === "jpg" || fileExtension === "jpeg") ? "image/jpeg" :
fileExtension == 'gif' ? 'image/gif' : undefined; fileExtension === "gif" ? "image/gif" : undefined;
this.dataURI = createURLFromArray(file.fileData, mimeType); this.dataURI = createURLFromArray(file.fileData, mimeType);
this.data = file; this.data = file;
}; };
kthoom.initProgressMeter = function() { kthoom.initProgressMeter = function() {
var svgns = 'http://www.w3.org/2000/svg'; var svgns = "http://www.w3.org/2000/svg";
var pdiv = $('#progress')[0]; // document.getElementById('progress'); var pdiv = $("#progress")[0];
var svg = document.createElementNS(svgns, 'svg'); var svg = document.createElementNS(svgns, "svg");
svg.style.width = '100%'; svg.style.width = "100%";
svg.style.height = '100%'; svg.style.height = "100%";
var defs = document.createElementNS(svgns, 'defs'); var defs = document.createElementNS(svgns, "defs");
var patt = document.createElementNS(svgns, 'pattern'); var patt = document.createElementNS(svgns, "pattern");
patt.id = 'progress_pattern'; patt.id = "progress_pattern";
patt.setAttribute('width', '30'); patt.setAttribute("width", "30");
patt.setAttribute('height', '20'); patt.setAttribute("height", "20");
patt.setAttribute('patternUnits', 'userSpaceOnUse'); patt.setAttribute("patternUnits", "userSpaceOnUse");
var rect = document.createElementNS(svgns, 'rect'); var rect = document.createElementNS(svgns, "rect");
rect.setAttribute('width', '100%'); rect.setAttribute("width", "100%");
rect.setAttribute('height', '100%'); rect.setAttribute("height", "100%");
rect.setAttribute('fill', '#cc2929'); rect.setAttribute("fill", "#cc2929");
var poly = document.createElementNS(svgns, 'polygon'); var poly = document.createElementNS(svgns, "polygon");
poly.setAttribute('fill', 'yellow'); poly.setAttribute("fill", "yellow");
poly.setAttribute('points', '15,0 30,0 15,20 0,20'); poly.setAttribute("points", "15,0 30,0 15,20 0,20");
patt.appendChild(rect); patt.appendChild(rect);
patt.appendChild(poly); patt.appendChild(poly);
@ -138,55 +133,55 @@ kthoom.initProgressMeter = function() {
svg.appendChild(defs); svg.appendChild(defs);
var g = document.createElementNS(svgns, 'g'); var g = document.createElementNS(svgns, "g");
var outline = document.createElementNS(svgns, 'rect'); var outline = document.createElementNS(svgns, "rect");
outline.setAttribute('y', '1'); outline.setAttribute("y", "1");
outline.setAttribute('width', '100%'); outline.setAttribute("width", "100%");
outline.setAttribute('height', '15'); outline.setAttribute("height", "15");
outline.setAttribute('fill', '#777'); outline.setAttribute("fill", "#777");
outline.setAttribute('stroke', 'white'); outline.setAttribute("stroke", "white");
outline.setAttribute('rx', '5'); outline.setAttribute("rx", "5");
outline.setAttribute('ry', '5'); outline.setAttribute("ry", "5");
g.appendChild(outline); g.appendChild(outline);
var title = document.createElementNS(svgns, 'text'); var title = document.createElementNS(svgns, "text");
title.id = 'progress_title'; title.id = "progress_title";
title.appendChild(document.createTextNode('0%')); title.appendChild(document.createTextNode("0%"));
title.setAttribute('y', '13'); title.setAttribute("y", "13");
title.setAttribute('x', '99.5%'); title.setAttribute("x", "99.5%");
title.setAttribute('fill', 'white'); title.setAttribute("fill", "white");
title.setAttribute('font-size', '12px'); title.setAttribute("font-size", "12px");
title.setAttribute('text-anchor', 'end'); title.setAttribute("text-anchor", "end");
g.appendChild(title); g.appendChild(title);
var meter = document.createElementNS(svgns, 'rect'); var meter = document.createElementNS(svgns, "rect");
meter.id = 'meter'; meter.id = "meter";
meter.setAttribute('width', '0%'); meter.setAttribute("width", "0%");
meter.setAttribute('height', '17'); meter.setAttribute("height", "17");
meter.setAttribute('fill', 'url(#progress_pattern)'); meter.setAttribute("fill", "url(#progress_pattern)");
meter.setAttribute('rx', '5'); meter.setAttribute("rx", "5");
meter.setAttribute('ry', '5'); meter.setAttribute("ry", "5");
var meter2 = document.createElementNS(svgns, 'rect'); var meter2 = document.createElementNS(svgns, "rect");
meter2.id = 'meter2'; meter2.id = "meter2";
meter2.setAttribute('width', '0%'); meter2.setAttribute("width", "0%");
meter2.setAttribute('height', '17'); meter2.setAttribute("height", "17");
meter2.setAttribute('opacity', '0.8'); meter2.setAttribute("opacity", "0.8");
meter2.setAttribute('fill', '#007fff'); meter2.setAttribute("fill", "#007fff");
meter2.setAttribute('rx', '5'); meter2.setAttribute("rx", "5");
meter2.setAttribute('ry', '5'); meter2.setAttribute("ry", "5");
g.appendChild(meter); g.appendChild(meter);
g.appendChild(meter2); g.appendChild(meter2);
var page = document.createElementNS(svgns, 'text'); var page = document.createElementNS(svgns, "text");
page.id = 'page'; page.id = "page";
page.appendChild(document.createTextNode('0/0')); page.appendChild(document.createTextNode("0/0"));
page.setAttribute('y', '13'); page.setAttribute("y", "13");
page.setAttribute('x', '0.5%'); page.setAttribute("x", "0.5%");
page.setAttribute('fill', 'white'); page.setAttribute("fill", "white");
page.setAttribute('font-size', '12px'); page.setAttribute("font-size", "12px");
g.appendChild(page); g.appendChild(page);
@ -210,42 +205,42 @@ kthoom.setProgressMeter = function(pct, opt_label) {
if (totalImages == 0) smartpct = pct; if (totalImages == 0) smartpct = pct;
// + Math.min((pct - lastCompletion), 100/totalImages * 0.9 + (pct - lastCompletion - 100/totalImages)/2, 100/totalImages); // + Math.min((pct - lastCompletion), 100/totalImages * 0.9 + (pct - lastCompletion - 100/totalImages)/2, 100/totalImages);
var oldval = parseFloat(getElem('meter').getAttribute('width')); var oldval = parseFloat(getElem("meter").getAttribute("width"));
if (isNaN(oldval)) oldval = 0; if (isNaN(oldval)) oldval = 0;
var weight = 0.5; var weight = 0.5;
smartpct = (weight * smartpct + (1-weight) * oldval); smartpct = (weight * smartpct + (1-weight) * oldval);
if (pct == 100) smartpct = 100; if (pct == 100) smartpct = 100;
if (!isNaN(smartpct)) { if (!isNaN(smartpct)) {
getElem('meter').setAttribute('width', smartpct + '%'); getElem("meter").setAttribute("width", smartpct + "%");
} }
var title = getElem('progress_title'); var title = getElem("progress_title");
while (title.firstChild) title.removeChild(title.firstChild); while (title.firstChild) title.removeChild(title.firstChild);
var labelText = pct.toFixed(2) + '% ' + imageFiles.length + '/' + totalImages + ''; var labelText = pct.toFixed(2) + "% " + imageFiles.length + "/" + totalImages + "";
if (opt_label) { if (opt_label) {
labelText = opt_label + ' ' + labelText; labelText = opt_label + " " + labelText;
} }
title.appendChild(document.createTextNode(labelText)); title.appendChild(document.createTextNode(labelText));
getElem('meter2').setAttribute('width', getElem("meter2").setAttribute("width",
100 * (totalImages == 0 ? 0 : ((currentImage+1)/totalImages)) + '%'); 100 * (totalImages == 0 ? 0 : ((currentImage+1)/totalImages)) + "%");
var title = getElem('page'); var title = getElem("page");
while (title.firstChild) title.removeChild(title.firstChild); while (title.firstChild) title.removeChild(title.firstChild);
title.appendChild(document.createTextNode( (currentImage+1) + '/' + totalImages )); title.appendChild(document.createTextNode( (currentImage+1) + '/' + totalImages ));
if (pct > 0) { if (pct > 0) {
//getElem('nav').className = ''; //getElem('nav').className = '';
getElem('progress').className = ''; getElem("progress").className = '';
} }
} }
function loadFromArrayBuffer(ab) { function loadFromArrayBuffer(ab) {
var start = (new Date).getTime(); var start = (new Date).getTime();
var h = new Uint8Array(ab, 0, 10); var h = new Uint8Array(ab, 0, 10);
var pathToBitJS = '../../static/js/'; var pathToBitJS = "../../static/js/";
if (h[0] == 0x52 && h[1] == 0x61 && h[2] == 0x72 && h[3] == 0x21) { //Rar! if (h[0] == 0x52 && h[1] == 0x61 && h[2] == 0x72 && h[3] == 0x21) { //Rar!
unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS); unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
} else if (h[0] == 80 && h[1] == 75) { //PK (Zip) } else if (h[0] == 80 && h[1] == 75) { //PK (Zip)
@ -259,7 +254,7 @@ function loadFromArrayBuffer(ab) {
function(e) { function(e) {
var percentage = e.currentBytesUnarchived / e.totalUncompressedBytesInArchive; var percentage = e.currentBytesUnarchived / e.totalUncompressedBytesInArchive;
totalImages = e.totalFilesInArchive; totalImages = e.totalFilesInArchive;
kthoom.setProgressMeter(percentage, 'Unzipping'); kthoom.setProgressMeter(percentage, "Unzipping");
// display nav // display nav
lastCompletion = percentage * 100; lastCompletion = percentage * 100;
}); });
@ -282,11 +277,11 @@ function loadFromArrayBuffer(ab) {
unarchiver.addEventListener(bitjs.archive.UnarchiveEvent.Type.FINISH, unarchiver.addEventListener(bitjs.archive.UnarchiveEvent.Type.FINISH,
function(e) { function(e) {
var diff = ((new Date).getTime() - start)/1000; var diff = ((new Date).getTime() - start)/1000;
console.log('Unarchiving done in ' + diff + 's'); console.log("Unarchiving done in " + diff + "s");
}); });
unarchiver.start(); unarchiver.start();
} else { } else {
alert('Some error'); alert("Some error");
} }
} }
var createURLFromArray = function(array, mimeType) { var createURLFromArray = function(array, mimeType) {
@ -298,21 +293,21 @@ var createURLFromArray = function(array, mimeType) {
// and do it just once. // and do it just once.
// Blob constructor, see http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob. // Blob constructor, see http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob.
if (typeof Blob == 'function') { if (typeof Blob == "function") {
blob = new Blob([array], {type: mimeType}); blob = new Blob([array], {type: mimeType});
} else { } else {
throw 'Browser support for Blobs is missing.' throw "Browser support for Blobs is missing."
} }
if (blob.slice) { if (blob.slice) {
blob = blob.slice(offset, offset + len, mimeType); blob = blob.slice(offset, offset + len, mimeType);
} else { } else {
throw 'Browser support for Blobs is missing.' throw "Browser support for Blobs is missing."
} }
if ((typeof URL != 'function' && typeof URL != 'object') || if ((typeof URL != "function" && typeof URL != "object") ||
typeof URL.createObjectURL != 'function') { typeof URL.createObjectURL != "function") {
throw 'Browser support for Object URLs is missing'; throw "Browser support for Object URLs is missing";
} }
return URL.createObjectURL(blob); return URL.createObjectURL(blob);
@ -320,34 +315,34 @@ var createURLFromArray = function(array, mimeType) {
function updatePage() { function updatePage() {
var title = getElem('page'); var title = getElem("page");
while (title.firstChild) title.removeChild(title.firstChild); while (title.firstChild) title.removeChild(title.firstChild);
title.appendChild(document.createTextNode( (currentImage+1) + '/' + totalImages )); title.appendChild(document.createTextNode( (currentImage+1) + "/" + totalImages ));
getElem('meter2').setAttribute('width', getElem("meter2").setAttribute("width",
100 * (totalImages == 0 ? 0 : ((currentImage+1)/totalImages)) + '%'); 100 * (totalImages == 0 ? 0 : ((currentImage+1)/totalImages)) + "%");
if (imageFiles[currentImage]) { if (imageFiles[currentImage]) {
setImage(imageFiles[currentImage].dataURI); setImage(imageFiles[currentImage].dataURI);
} else { } else {
setImage('loading'); setImage("loading");
} }
} }
function setImage(url) { function setImage(url) {
var canvas = $("#mainImage")[0]; var canvas = $("#mainImage")[0];
var x = $("#mainImage")[0].getContext('2d'); var x = $("#mainImage")[0].getContext("2d");
$('#mainText').hide(); $("#mainText").hide();
if (url == 'loading') { if (url == "loading") {
updateScale(true); updateScale(true);
canvas.width = innerWidth - 100; canvas.width = innerWidth - 100;
canvas.height = 200; canvas.height = 200;
x.fillStyle = 'red'; x.fillStyle = "red";
x.font = '50px sans-serif'; x.font = "50px sans-serif";
x.strokeStyle = 'black'; x.strokeStyle = "black";
x.fillText('Loading Page #' + (currentImage + 1), 100, 100) x.fillText("Loading Page #" + (currentImage + 1), 100, 100)
} else { } else {
if ($('body').css('scrollHeight')/innerHeight > 1) { if ($("body").css("scrollHeight")/innerHeight > 1) {
$('body').css('overflowY', 'scroll'); $("body").css("overflowY", "scroll");
} }
var img = new Image(); var img = new Image();
@ -355,26 +350,26 @@ function setImage(url) {
canvas.width = innerWidth - 100; canvas.width = innerWidth - 100;
canvas.height = 300; canvas.height = 300;
updateScale(true); updateScale(true);
x.fillStyle = 'orange'; x.fillStyle = "orange";
x.font = '50px sans-serif'; x.font = "50px sans-serif";
x.strokeStyle = 'black'; x.strokeStyle = "black";
x.fillText('Page #' + (currentImage+1) + ' (' + x.fillText("Page #" + (currentImage+1) + " (" +
imageFiles[currentImage].filename + ')', 100, 100) imageFiles[currentImage].filename + ")", 100, 100)
x.fillStyle = 'red'; x.fillStyle = "red";
x.fillText('Is corrupt or not an image', 100, 200); x.fillText("Is corrupt or not an image", 100, 200);
if (/(html|htm)$/.test(imageFiles[currentImage].filename)) { if (/(html|htm)$/.test(imageFiles[currentImage].filename)) {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open("GET", url, true);
xhr.onload = function() { xhr.onload = function() {
//document.getElementById('mainText').style.display = ''; //document.getElementById('mainText').style.display = '';
$("#mainText").css("display", ""); $("#mainText").css("display", "");
$("#mainText").innerHTML('<iframe style="width:100%;height:700px;border:0" src="data:text/html,'+escape(xhr.responseText)+'"></iframe>'); $("#mainText").innerHTML("<iframe style=\"width:100%;height:700px;border:0\" src=\"data:text/html,"+escape(xhr.responseText)+"\"></iframe>");
} }
xhr.send(null); xhr.send(null);
} else if (!/(jpg|jpeg|png|gif)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10*1024) { } else if (!/(jpg|jpeg|png|gif)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10*1024) {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open("GET", url, true);
xhr.onload = function() { xhr.onload = function() {
$("#mainText").css("display", ""); $("#mainText").css("display", "");
$("#mainText").innerText(xhr.responseText); $("#mainText").innerText(xhr.responseText);
@ -403,7 +398,7 @@ function setImage(url) {
x.scale(-1, 1) x.scale(-1, 1)
x.translate(-w, 0); x.translate(-w, 0);
} }
canvas.style.display = 'none'; canvas.style.display = "none";
scrollTo(0,0); scrollTo(0,0);
x.drawImage(img, 0, 0); x.drawImage(img, 0, 0);
@ -452,23 +447,23 @@ function showNextPage() {
} }
function updateScale(clear) { function updateScale(clear) {
var mainImageStyle = getElem('mainImage').style; var mainImageStyle = getElem("mainImage").style;
mainImageStyle.width = ''; mainImageStyle.width = "";
mainImageStyle.height = ''; mainImageStyle.height = "";
mainImageStyle.maxWidth = ''; mainImageStyle.maxWidth = "";
mainImageStyle.maxHeight = ''; mainImageStyle.maxHeight = "";
var maxheight = innerHeight - 15; var maxheight = innerHeight - 15;
if (!/main/.test(getElem('titlebar').className)) { if (!/main/.test(getElem("titlebar").className)) {
maxheight -= 25; maxheight -= 25;
} }
if (clear || fitMode == kthoom.Key.N) { if (clear || fitMode == kthoom.Key.N) {
} else if (fitMode == kthoom.Key.B) { } else if (fitMode == kthoom.Key.B) {
mainImageStyle.maxWidth = '100%'; mainImageStyle.maxWidth = "100%";
mainImageStyle.maxHeight = maxheight + 'px'; mainImageStyle.maxHeight = maxheight + "px";
} else if (fitMode == kthoom.Key.H) { } else if (fitMode == kthoom.Key.H) {
mainImageStyle.height = maxheight + 'px'; mainImageStyle.height = maxheight + "px";
} else if (fitMode == kthoom.Key.W) { } else if (fitMode == kthoom.Key.W) {
mainImageStyle.width = '100%'; mainImageStyle.width = "100%";
} }
kthoom.saveSettings(); kthoom.saveSettings();
} }
@ -476,7 +471,7 @@ function updateScale(clear) {
function keyHandler(evt) { function keyHandler(evt) {
var code = evt.keyCode; var code = evt.keyCode;
if (getComputedStyle(getElem('progress')).display == 'none') return; if (getComputedStyle(getElem("progress")).display == "none") return;
canKeyNext = ((document.body.offsetWidth+document.body.scrollLeft)/ document.body.scrollWidth) >= 1; canKeyNext = ((document.body.offsetWidth+document.body.scrollLeft)/ document.body.scrollWidth) >= 1;
canKeyPrev = (scrollX <= 0); canKeyPrev = (scrollX <= 0);
@ -537,14 +532,14 @@ function keyHandler(evt) {
function init(filename) { function init(filename) {
if (!window.FileReader) { if (!window.FileReader) {
alert('Sorry, kthoom will not work with your browser because it does not support the File API. Please try kthoom with Chrome 12+ or Firefox 7+'); alert("Sorry, kthoom will not work with your browser because it does not support the File API. Please try kthoom with Chrome 12+ or Firefox 7+");
} else { } else {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET",filename); request.open("GET",filename);
request.responseType="arraybuffer"; request.responseType="arraybuffer";
request.setRequestHeader("X-Test","test1"); request.setRequestHeader("X-Test","test1");
request.setRequestHeader("X-Test","test2"); request.setRequestHeader("X-Test","test2");
request.addEventListener('load', function(event) { request.addEventListener("load", function(event) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
loadFromArrayBuffer(request.response); loadFromArrayBuffer(request.response);
} else { } else {
@ -553,21 +548,21 @@ function init(filename) {
}); });
request.send(); request.send();
kthoom.initProgressMeter(); kthoom.initProgressMeter();
document.body.className += /AppleWebKit/.test(navigator.userAgent) ? ' webkit' : ''; document.body.className += /AppleWebKit/.test(navigator.userAgent) ? " webkit" : "";
kthoom.loadSettings(); kthoom.loadSettings();
$(document).keydown(keyHandler); $(document).keydown(keyHandler);
$(window).resize(function() { $(window).resize(function() {
var f = (screen.width - innerWidth < 4 && screen.height - innerHeight < 4); var f = (screen.width - innerWidth < 4 && screen.height - innerHeight < 4);
getElem('titlebar').className = f ? 'main' : ''; getElem("titlebar").className = f ? "main" : "";
updateScale(); updateScale();
}); });
$('#mainImage').click(function(evt) { $("#mainImage").click(function(evt) {
// Firefox does not support offsetX/Y so we have to manually calculate // Firefox does not support offsetX/Y so we have to manually calculate
// where the user clicked in the image. // where the user clicked in the image.
var mainContentWidth = getElem('mainContent').clientWidth; var mainContentWidth = getElem("mainContent").clientWidth;
var mainContentHeight = getElem('mainContent').clientHeight; var mainContentHeight = getElem("mainContent").clientHeight;
var comicWidth = evt.target.clientWidth; var comicWidth = evt.target.clientWidth;
var comicHeight = evt.target.clientHeight; var comicHeight = evt.target.clientHeight;
var offsetX = (mainContentWidth - comicWidth) / 2; var offsetX = (mainContentWidth - comicWidth) / 2;

5
cps/static/js/unrar.js
View File

@ -8,10 +8,11 @@
* *
* http://kthoom.googlecode.com/hg/docs/unrar.html * http://kthoom.googlecode.com/hg/docs/unrar.html
*/ */
/* global bitjs */
// This file expects to be invoked as a Worker (see onmessage below). // This file expects to be invoked as a Worker (see onmessage below).
importScripts('io.js'); importScripts("io.js");
importScripts('archive.js'); importScripts("archive.js");
// Progress variables. // Progress variables.
var currentFilename = ""; var currentFilename = "";

5
cps/static/js/untar.js
View File

@ -7,10 +7,11 @@
* *
* TAR format: http://www.gnu.org/software/automake/manual/tar/Standard.html * TAR format: http://www.gnu.org/software/automake/manual/tar/Standard.html
*/ */
/* global bitjs */
// This file expects to be invoked as a Worker (see onmessage below). // This file expects to be invoked as a Worker (see onmessage below).
importScripts('io.js'); importScripts("io.js");
importScripts('archive.js'); importScripts("archive.js");
// Progress variables. // Progress variables.
var currentFilename = ""; var currentFilename = "";

5
cps/static/js/unzip.js
View File

@ -9,10 +9,11 @@
* ZIP format: http://www.pkware.com/documents/casestudies/APPNOTE.TXT * ZIP format: http://www.pkware.com/documents/casestudies/APPNOTE.TXT
* DEFLATE format: http://tools.ietf.org/html/rfc1951 * DEFLATE format: http://tools.ietf.org/html/rfc1951
*/ */
/* global bitjs */
// This file expects to be invoked as a Worker (see onmessage below). // This file expects to be invoked as a Worker (see onmessage below).
importScripts('io.js'); importScripts("io.js");
importScripts('archive.js'); importScripts("archive.js");
// Progress variables. // Progress variables.
var currentFilename = ""; var currentFilename = "";

10
cps/web.py
View File

@ -1808,12 +1808,12 @@ def read_book(book_id, book_format):
elif book_format.lower() == "txt": elif book_format.lower() == "txt":
return render_title_template('readtxt.html', txtfile=book_id, title=_(u"Read a Book")) return render_title_template('readtxt.html', txtfile=book_id, title=_(u"Read a Book"))
else: else:
for format in ["cbr","cbt","cbz"]: for fileext in ["cbr","cbt","cbz"]:
if book_format.lower() == format: if book_format.lower() == fileext:
all_name = str(book_id) + "/" + book.data[0].name + "." + format all_name = str(book_id) + "/" + book.data[0].name + "." + fileext
tmp_file = os.path.join(book_dir, book.data[0].name) + "." + format tmp_file = os.path.join(book_dir, book.data[0].name) + "." + fileext
if not os.path.exists(all_name): if not os.path.exists(all_name):
cbr_file = os.path.join(config.config_calibre_dir, book.path, book.data[0].name) + "." + format cbr_file = os.path.join(config.config_calibre_dir, book.path, book.data[0].name) + "." + fileext
copyfile(cbr_file, tmp_file) copyfile(cbr_file, tmp_file)
return render_title_template('readcbr.html', comicfile=all_name, title=_(u"Read a Book")) return render_title_template('readcbr.html', comicfile=all_name, title=_(u"Read a Book"))