From 9356148e2d9961a464f7fc5e6374dcab90b007c9 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Tue, 6 Aug 2019 19:53:24 +0200 Subject: [PATCH] Added more information about dependencies --- cps/about.py | 6 +++++- cps/uploader.py | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cps/about.py b/cps/about.py index 85a924e2..a54754c7 100644 --- a/cps/about.py +++ b/cps/about.py @@ -41,6 +41,8 @@ try: except ImportError: unidecode_version = _(u'not installed') +from . import services + about = flask.Blueprint('about', __name__) @@ -59,7 +61,9 @@ _VERSIONS = OrderedDict( SQLite=sqlite3.sqlite_version, iso639=isoLanguages.__version__, pytz=pytz.__version__, - Unidecode = unidecode_version + Unidecode = unidecode_version, + Flask_SimpleLDAP = _(u'installed') if bool(services.ldap) else _(u'not installed'), + Goodreads = _(u'installed') if bool(services.goodreads) else _(u'not installed'), ) _VERSIONS.update(uploader.get_versions()) diff --git a/cps/uploader.py b/cps/uploader.py index 7be5e6ba..4c6b0c97 100644 --- a/cps/uploader.py +++ b/cps/uploader.py @@ -224,11 +224,16 @@ def get_versions(): PILVersion = 'v' + PILversion else: PILVersion = _(u'not installed') + if comic.use_comic_meta: + ComicVersion = _(u'installed') + else: + ComicVersion = _(u'not installed') return {'Image Magick': IVersion, 'PyPdf': PVersion, 'lxml':XVersion, 'Wand': WVersion, - 'Pillow': PILVersion} + 'Pillow': PILVersion, + 'Comic_API': ComicVersion} def upload(uploadfile):