From cde51e743a643b312f2760195ac4195962818f6d Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 1 May 2022 12:36:35 +0200 Subject: [PATCH] Removed duplicate Werkzeug entry in about page Code cosmetics --- cps/about.py | 66 +++++++++++++++++++--------------------- cps/dep_check.py | 23 +++++++------- cps/templates/stats.html | 2 +- cps/uploader.py | 2 +- 4 files changed, 46 insertions(+), 47 deletions(-) diff --git a/cps/about.py b/cps/about.py index 1b68818d..31e843b9 100644 --- a/cps/about.py +++ b/cps/about.py @@ -25,7 +25,6 @@ import platform import sqlite3 from collections import OrderedDict -import werkzeug import flask import flask_login import jinja2 @@ -37,41 +36,40 @@ from .render_template import render_title_template about = flask.Blueprint('about', __name__) -ret = dict() -req = dep_check.load_dependencys(False) -opt = dep_check.load_dependencys(True) +modules = dict() +req = dep_check.load_dependencies(False) +opt = dep_check.load_dependencies(True) for i in (req + opt): - ret[i[1]] = i[0] - -if constants.NIGHTLY_VERSION[0] == "$Format:%H$": - calibre_web_version = constants.STABLE_VERSION['version'] -else: - calibre_web_version = (constants.STABLE_VERSION['version'] + ' - ' - + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - ' - + constants.NIGHTLY_VERSION[1].replace('%', '%%')) - -if getattr(sys, 'frozen', False): - calibre_web_version += " - Exe-Version" -elif constants.HOME_CONFIG: - calibre_web_version += " - pyPi" - -_VERSIONS = OrderedDict( - Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()), - Python=sys.version, - Calibre_Web=calibre_web_version, - Werkzeug=werkzeug.__version__, - Jinja2=jinja2.__version__, - pySqlite=sqlite3.version, - SQLite=sqlite3.sqlite_version, -) -_VERSIONS.update(ret) -_VERSIONS.update(uploader.get_versions()) + modules[i[1]] = i[0] +modules['Jinja2'] = jinja2.__version__ +modules['pySqlite'] = sqlite3.version +modules['SQLite'] = sqlite3.sqlite_version +sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefold()))) def collect_stats(): - _VERSIONS['ebook converter'] = converter.get_calibre_version() - _VERSIONS['unrar'] = converter.get_unrar_version() - _VERSIONS['kepubify'] = converter.get_kepubify_version() + if constants.NIGHTLY_VERSION[0] == "$Format:%H$": + calibre_web_version = constants.STABLE_VERSION['version'] + else: + calibre_web_version = (constants.STABLE_VERSION['version'] + ' - ' + + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - ' + + constants.NIGHTLY_VERSION[1].replace('%', '%%')) + + if getattr(sys, 'frozen', False): + calibre_web_version += " - Exe-Version" + elif constants.HOME_CONFIG: + calibre_web_version += " - pyPi" + + _VERSIONS = {'Calibre Web': calibre_web_version} + _VERSIONS.update(OrderedDict( + Python=sys.version, + Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()), + )) + _VERSIONS.update(uploader.get_magick_version()) + _VERSIONS['Unrar'] = converter.get_unrar_version() + _VERSIONS['Ebook converter'] = converter.get_calibre_version() + _VERSIONS['Kepubify'] = converter.get_kepubify_version() + _VERSIONS.update(sorted_modules) return _VERSIONS @@ -80,7 +78,7 @@ def collect_stats(): def stats(): counter = calibre_db.session.query(db.Books).count() authors = calibre_db.session.query(db.Authors).count() - categorys = calibre_db.session.query(db.Tags).count() + categories = calibre_db.session.query(db.Tags).count() series = calibre_db.session.query(db.Series).count() return render_title_template('stats.html', bookcounter=counter, authorcounter=authors, versions=collect_stats(), - categorycounter=categorys, seriecounter=series, title=_(u"Statistics"), page="stat") + categorycounter=categories, seriecounter=series, title=_(u"Statistics"), page="stat") diff --git a/cps/dep_check.py b/cps/dep_check.py index 929185c2..431d7019 100644 --- a/cps/dep_check.py +++ b/cps/dep_check.py @@ -20,7 +20,8 @@ if not importlib: except ImportError as e: pkgresources = False -def load_dependencys(optional=False): + +def load_dependencies(optional=False): deps = list() if getattr(sys, 'frozen', False): pip_installed = os.path.join(BASE_DIR, ".pip_installed") @@ -57,7 +58,7 @@ def load_dependencys(optional=False): def dependency_check(optional=False): d = list() - deps = load_dependencys(optional) + deps = load_dependencies(optional) for dep in deps: try: dep_version_int = [int(x) for x in dep[0].split('.')] @@ -67,28 +68,28 @@ def dependency_check(optional=False): high_check = None except ValueError: d.append({'name': dep[1], - 'target': "available", - 'found': "Not available" - }) + 'target': "available", + 'found': "Not available" + }) continue if dep[2].strip() == "==": if dep_version_int != low_check: d.append({'name': dep[1], - 'found': dep[0], - "target": dep[2] + dep[3]}) + 'found': dep[0], + "target": dep[2] + dep[3]}) continue elif dep[2].strip() == ">=": if dep_version_int < low_check: d.append({'name': dep[1], - 'found': dep[0], - "target": dep[2] + dep[3]}) + 'found': dep[0], + "target": dep[2] + dep[3]}) continue elif dep[2].strip() == ">": if dep_version_int <= low_check: d.append({'name': dep[1], - 'found': dep[0], - "target": dep[2] + dep[3]}) + 'found': dep[0], + "target": dep[2] + dep[3]}) continue if dep[4] and dep[5]: if dep[4].strip() == "<": diff --git a/cps/templates/stats.html b/cps/templates/stats.html index 62a29308..07219ea6 100644 --- a/cps/templates/stats.html +++ b/cps/templates/stats.html @@ -30,7 +30,7 @@ - + diff --git a/cps/uploader.py b/cps/uploader.py index 5dbd1249..92035356 100644 --- a/cps/uploader.py +++ b/cps/uploader.py @@ -231,7 +231,7 @@ def pdf_preview(tmp_file_path, tmp_dir): return None -def get_versions(): +def get_magick_version(): ret = dict() if not use_generic_pdf_cover: ret['Image Magick'] = ImageVersion.MAGICK_VERSION
{{_('Program Library')}}{{_('Program')}} {{_('Installed Version')}}