From e60ef8fc97aca18de04f42925515bf77930b2b7a Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sun, 23 Feb 2020 12:40:11 +0100 Subject: [PATCH] Calibre-web version visible in about section Update Calibre-web Version info --- cps/about.py | 7 +++++-- cps/constants.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cps/about.py b/cps/about.py index aa1e866e..8a77aae0 100644 --- a/cps/about.py +++ b/cps/about.py @@ -30,7 +30,7 @@ import babel, pytz, requests, sqlalchemy import werkzeug, flask, flask_login, flask_principal, jinja2 from flask_babel import gettext as _ -from . import db, converter, uploader, server, isoLanguages +from . import db, converter, uploader, server, isoLanguages, constants from .web import render_title_template try: from flask_login import __version__ as flask_loginVersion @@ -49,8 +49,11 @@ about = flask.Blueprint('about', __name__) _VERSIONS = OrderedDict( - Platform = ' '.join(platform.uname()), + Platform = '{0.system} {0.release} {0.version} {0.processor} {0.machine}'.format(platform.uname()), Python=sys.version, + Calibre_Web=constants.STABLE_VERSION['version'] + ' - ' + + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - ' + + constants.NIGHTLY_VERSION[1].replace('%','%%'), WebServer=server.VERSION, Flask=flask.__version__, Flask_Login=flask_loginVersion, diff --git a/cps/constants.py b/cps/constants.py index 3b3b1482..8301800b 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -125,7 +125,7 @@ def selected_roles(dictionary): BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, ' 'series_id, languages') -STABLE_VERSION = {'version': '0.6.6'} +STABLE_VERSION = {'version': '0.6.7 Beta'} NIGHTLY_VERSION = {} NIGHTLY_VERSION[0] = '$Format:%H$'