From 6940bb9b886a6e0b811426abf9ae6ccb07ca433f Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sun, 24 Mar 2019 15:58:43 +0100 Subject: [PATCH] Code improvement --- cps/admin.py | 2 +- cps/helper.py | 5 +++++ cps/opds.py | 5 ----- cps/static/js/unrar.js | 8 ++++---- cps/static/js/unzip.js | 17 ++++++++--------- cps/updater.py | 3 --- cps/web.py | 13 ++++--------- 7 files changed, 22 insertions(+), 31 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 267b7183..852ea5df 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -529,7 +529,7 @@ def new_user(): content.locale = to_save["locale"] val = 0 - for key,v in to_save.items(): + for key, _ in to_save.items(): if key.startswith('show'): val += int(key[5:]) content.sidebar_view = val diff --git a/cps/helper.py b/cps/helper.py index 9eb15ecd..d32b1e5c 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -67,6 +67,11 @@ try: except ImportError: use_levenshtein = False +try: + from functools import reduce +except ImportError: + pass # We're not using Python 3 + def update_download(book_id, user_id): check = ub.session.query(ub.Downloads).filter(ub.Downloads.user_id == user_id).filter(ub.Downloads.book_id == diff --git a/cps/opds.py b/cps/opds.py index 67bce0a1..a055963c 100644 --- a/cps/opds.py +++ b/cps/opds.py @@ -37,11 +37,6 @@ from werkzeug.security import check_password_hash from helper import fill_indexpage import sys -try: - from urllib.parse import quote -except ImportError: - from urllib import quote - opds = Blueprint('opds', __name__) diff --git a/cps/static/js/unrar.js b/cps/static/js/unrar.js index 5d952720..255970e3 100644 --- a/cps/static/js/unrar.js +++ b/cps/static/js/unrar.js @@ -641,7 +641,7 @@ function unpack29(bstream) { continue; } if (num === 258) { - if (lastLength != 0) { + if (lastLength !== 0) { rarCopyString(lastLength, lastDist); } continue; @@ -690,7 +690,7 @@ function rarReadEndOfBlock(bstream) { NewTable = !!bstream.readBits(1); } //tablesRead = !NewTable; - return !(NewFile || NewTable && !rarReadTables(bstream)); + return !(NewFile || (NewTable && !rarReadTables(bstream))); } @@ -784,7 +784,7 @@ var RarLocalFile = function(bstream) { this.header = new RarVolumeHeader(bstream); this.filename = this.header.filename; - if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) { + if (this.header.headType !== FILE_HEAD && this.header.headType !== ENDARC_HEAD) { this.isValid = false; info("Error! RAR Volume did not include a FILE_HEAD header "); } else { @@ -840,7 +840,7 @@ var unrar = function(arrayBuffer) { info("Found RAR signature"); var mhead = new RarVolumeHeader(bstream); - if (mhead.headType != MAIN_HEAD) { + if (mhead.headType !== MAIN_HEAD) { info("Error! RAR did not include a MAIN_HEAD header"); } else { var localFiles = []; diff --git a/cps/static/js/unzip.js b/cps/static/js/unzip.js index bec20ac1..7fce4bf4 100644 --- a/cps/static/js/unzip.js +++ b/cps/static/js/unzip.js @@ -179,7 +179,7 @@ var unzip = function(arrayBuffer) { info(" Found a Central File Header"); // read all file headers - while (bstream.peekNumber(4) == zCentralFileHeaderSignature) { + while (bstream.peekNumber(4) === zCentralFileHeaderSignature) { bstream.readNumber(4); // signature bstream.readNumber(2); // version made by bstream.readNumber(2); // version needed to extract @@ -264,7 +264,7 @@ function getHuffmanCodes(bitLengths) { return null; } // increment the appropriate bitlength count - if (blCount[length] == undefined) blCount[length] = 0; + if (typeof blCount[length] === "undefined") blCount[length] = 0; // a length of zero means this symbol is not participating in the huffman coding if (length > 0) blCount[length]++; @@ -277,7 +277,7 @@ function getHuffmanCodes(bitLengths) { for (var bits = 1; bits <= MAX_BITS; ++bits) { var length2 = bits - 1; // ensure undefined lengths are zero - if (blCount[length2] == undefined) blCount[length2] = 0; + if (typeof blCount[length2] === "undefined") blCount[length2] = 0; code = (code + blCount[bits - 1]) << 1; nextCode [bits] = code; } @@ -522,11 +522,11 @@ function inflate(compressedData, numDecompressedBytes) { bFinal = bstream.readBits(1); var bType = bstream.readBits(2); blockSize = 0; - ++numBlocks; + // ++numBlocks; // no compression if (bType == 0) { // skip remaining bits in this byte - while (bstream.bitPtr != 0) bstream.readBits(1); + while (bstream.bitPtr !== 0) bstream.readBits(1); var len = bstream.readBits(16); bstream.readBits(16); // TODO: check if nlen is the ones-complement of len? @@ -535,11 +535,11 @@ function inflate(compressedData, numDecompressedBytes) { blockSize = len; } // fixed Huffman codes - else if (bType == 1) { + else if (bType === 1) { blockSize = inflateBlockData(bstream, getFixedLiteralTable(), getFixedDistanceTable(), buffer); } // dynamic Huffman codes - else if (bType == 2) { + else if (bType === 2) { var numLiteralLengthCodes = bstream.readBits(5) + 257; var numDistanceCodes = bstream.readBits(5) + 1, numCodeLengthCodes = bstream.readBits(4) + 4; @@ -576,8 +576,7 @@ function inflate(compressedData, numDecompressedBytes) { if (symbol <= 15) { literalCodeLengths.push(symbol); prevCodeLength = symbol; - } - else if (symbol === 16) { + } else if (symbol === 16) { var repeat = bstream.readBits(2) + 3; while (repeat--) { literalCodeLengths.push(prevCodeLength); diff --git a/cps/updater.py b/cps/updater.py index be851e9e..5907c974 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -341,9 +341,6 @@ class Updater(threading.Thread): else: status['success'] = False status['message'] = _(u'Could not fetch update information') - - # a new update is available - status['history'] = parents[::-1] return json.dumps(status) return '' diff --git a/cps/web.py b/cps/web.py index 4436be6c..41f5398b 100644 --- a/cps/web.py +++ b/cps/web.py @@ -41,7 +41,6 @@ from sqlalchemy.sql.expression import text, func, true, false, not_ import json import datetime from iso639 import languages as isoLanguages -import re import gdriveutils from redirect import redirect_back from cps import lm, babel, ub, config, get_locale, language_table, app, db @@ -69,7 +68,7 @@ except ImportError: feature_support['goodreads'] = False try: - from functools import reduce, wraps + from functools import wraps except ImportError: pass # We're not using Python 3 @@ -84,11 +83,6 @@ try: except ImportError: sort = sorted # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files -try: - from urllib.parse import quote -except ImportError: - from urllib import quote - from flask import Blueprint # Global variables @@ -944,7 +938,8 @@ def advanced_search(): series=series, title=_(u"search"), cc=cc, page="advsearch") -def render_read_books(page, are_read, as_xml=False, order=[]): +def render_read_books(page, are_read, as_xml=False, order=None): + order = order or [] if not config.config_read_column: readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\ .filter(ub.ReadBook.is_read is True).all() @@ -1271,7 +1266,7 @@ def profile(): current_user.locale = to_save["locale"] val = 0 - for key,v in to_save.items(): + for key, _ in to_save.items(): if key.startswith('show'): val += int(key[5:]) current_user.sidebar_view = val