From feb6a71f95e238b9b32a044b0acef6e5e3d2704f Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Tue, 5 Mar 2019 20:59:30 +0100 Subject: [PATCH] Fix uncompressed cbz files merge from master -> file extension limitation --- cps/editbooks.py | 7 ++---- cps/static/js/kthoom.js | 3 ++- cps/static/js/unzip.js | 47 ++++++++++++++++++++++++--------------- cps/templates/layout.html | 3 ++- cps/web.py | 13 ++++++----- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/cps/editbooks.py b/cps/editbooks.py index c96ec942..1da3aa77 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -22,11 +22,10 @@ # along with this program. If not, see . # opds routing functions -from cps import config, language_table, get_locale, app, ub, global_WorkerThread +from cps import config, language_table, get_locale, app, ub, global_WorkerThread, db from flask import request, flash, redirect, url_for, abort, Markup, Response from flask import Blueprint import datetime -from cps import db import os import json from flask_babel import gettext as _ @@ -34,7 +33,7 @@ from uuid import uuid4 import helper from flask_login import current_user from web import login_required_if_no_ano, common_filters, order_authors, render_title_template, edit_required, \ - upload_required, login_required + upload_required, login_required, EXTENSIONS_UPLOAD import gdriveutils from shutil import move, copyfile import uploader @@ -44,8 +43,6 @@ editbook = Blueprint('editbook', __name__) EXTENSIONS_CONVERT = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt'} -EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx', - 'fb2', 'html', 'rtf', 'odt', 'mp3', 'm4a', 'm4b'} diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js index 49ceae42..6ab25ad7 100644 --- a/cps/static/js/kthoom.js +++ b/cps/static/js/kthoom.js @@ -99,7 +99,8 @@ kthoom.setSettings = function() { }; var createURLFromArray = function(array, mimeType) { - var offset = array.byteOffset, len = array.byteLength; + var offset = array.byteOffset; + var len = array.byteLength; var url; var blob; diff --git a/cps/static/js/unzip.js b/cps/static/js/unzip.js index 2938c834..0a067516 100644 --- a/cps/static/js/unzip.js +++ b/cps/static/js/unzip.js @@ -68,23 +68,23 @@ var ZipLocalFile = function(bstream) { this.filename = bstream.readString(this.fileNameLength); } - console.log("Zip Local File Header:"); - console.log(" version=" + this.version); - console.log(" general purpose=" + this.generalPurpose); - console.log(" compression method=" + this.compressionMethod); - console.log(" last mod file time=" + this.lastModFileTime); - console.log(" last mod file date=" + this.lastModFileDate); - console.log(" crc32=" + this.crc32); - console.log(" compressed size=" + this.compressedSize); - console.log(" uncompressed size=" + this.uncompressedSize); - console.log(" file name length=" + this.fileNameLength); - console.log(" extra field length=" + this.extraFieldLength); - console.log(" filename = '" + this.filename + "'"); + info("Zip Local File Header:"); + info(" version=" + this.version); + info(" general purpose=" + this.generalPurpose); + info(" compression method=" + this.compressionMethod); + info(" last mod file time=" + this.lastModFileTime); + info(" last mod file date=" + this.lastModFileDate); + info(" crc32=" + this.crc32); + info(" compressed size=" + this.compressedSize); + info(" uncompressed size=" + this.uncompressedSize); + info(" file name length=" + this.fileNameLength); + info(" extra field length=" + this.extraFieldLength); + info(" filename = '" + this.filename + "'"); this.extraField = null; if (this.extraFieldLength > 0) { this.extraField = bstream.readString(this.extraFieldLength); - console.log(" extra field=" + this.extraField); + info(" extra field=" + this.extraField); } // read in the compressed data @@ -110,13 +110,14 @@ ZipLocalFile.prototype.unzip = function() { // Zip Version 1.0, no compression (store only) if (this.compressionMethod == 0 ) { - console.log("ZIP v" + this.version + ", store only: " + this.filename + " (" + this.compressedSize + " bytes)"); + info("ZIP v" + this.version + ", store only: " + this.filename + " (" + this.compressedSize + " bytes)"); currentBytesUnarchivedInFile = this.compressedSize; currentBytesUnarchived += this.compressedSize; + this.fileData = zeroCompression(this.fileData, this.uncompressedSize); } // version == 20, compression method == 8 (DEFLATE) else if (this.compressionMethod == 8) { - console.log("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)"); + info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)"); this.fileData = inflate(this.fileData, this.uncompressedSize); } else { @@ -164,7 +165,7 @@ var unzip = function(arrayBuffer) { // archive extra data record if (bstream.peekNumber(4) == zArchiveExtraDataSignature) { - console.log(" Found an Archive Extra Data Signature"); + info(" Found an Archive Extra Data Signature"); // skipping this record for now bstream.readNumber(4); @@ -175,7 +176,7 @@ var unzip = function(arrayBuffer) { // central directory structure // TODO: handle the rest of the structures (Zip64 stuff) if (bstream.peekNumber(4) == zCentralFileHeaderSignature) { - console.log(" Found a Central File Header"); + info(" Found a Central File Header"); // read all file headers while (bstream.peekNumber(4) == zCentralFileHeaderSignature) { @@ -205,7 +206,7 @@ var unzip = function(arrayBuffer) { // digital signature if (bstream.peekNumber(4) == zDigitalSignatureSignature) { - console.log(" Found a Digital Signature"); + info(" Found a Digital Signature"); bstream.readNumber(4); var sizeOfSignature = bstream.readNumber(2); @@ -493,6 +494,16 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) { return blockSize; } +function zeroCompression(compressedData, numDecompressedBytes) { + var bstream = new bitjs.io.BitStream(compressedData.buffer, + false /* rtl */, + compressedData.byteOffset, + compressedData.byteLength); + var buffer = new bitjs.io.ByteBuffer(numDecompressedBytes); + buffer.insertBytes(bstream.readBytes(numDecompressedBytes)); + return buffer.data; +} + // {Uint8Array} compressedData A Uint8Array of the compressed file data. // compression method 8 // deflate: http://tools.ietf.org/html/rfc1951 diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 48ffc0d0..93c8ab23 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -62,7 +62,8 @@
    • diff --git a/cps/web.py b/cps/web.py index 072069eb..c5bd7600 100644 --- a/cps/web.py +++ b/cps/web.py @@ -47,7 +47,6 @@ from cps import lm, babel, ub, config, get_locale, language_table, app, db from pagination import Pagination from sqlalchemy.sql.expression import text - feature_support = dict() try: from oauth_bb import oauth_check, register_user_with_oauth, logout_oauth_user, get_oauth_status @@ -106,6 +105,10 @@ from flask import Blueprint EXTENSIONS_AUDIO = {'mp3', 'm4a', 'm4b'} +EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx', + 'fb2', 'html', 'rtf', 'odt', 'mp3', 'm4a', 'm4b'} + + '''EXTENSIONS_READER = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt'] + (['rar','cbr'] if feature_support['rar'] else []))''' @@ -133,10 +136,7 @@ web = Blueprint('web', __name__) @lm.user_loader def load_user(user_id): - try: - return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first() - except Exception as e: - print(e) + return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first() @lm.header_loader @@ -325,7 +325,8 @@ def get_search_results(term): # Returns the template for rendering and includes the instance name def render_title_template(*args, **kwargs): sidebar=ub.get_sidebar_config(kwargs) - return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, *args, **kwargs) + return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, accept=EXTENSIONS_UPLOAD, + *args, **kwargs) @web.before_app_request