From d341faf204a73ecfe17c988cc43cc50a9b4cbbb0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 9 Dec 2023 09:36:28 +0100
Subject: [PATCH] Make Version setuptools compatible and still have the "Beta"
 in the User interface

---
 cps/about.py     | 4 ++--
 cps/admin.py     | 2 +-
 cps/cli.py       | 4 ++--
 cps/constants.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 7b6cc71a..1d081fe2 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -49,9 +49,9 @@ sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefol
 
 def collect_stats():
     if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
-        calibre_web_version = constants.STABLE_VERSION['version']
+        calibre_web_version = constants.STABLE_VERSION['version'].replace("b", " Beta")
     else:
-        calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
+        calibre_web_version = (constants.STABLE_VERSION['version'].replace("b", " Beta") + ' - '
                                + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
                                + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
 
diff --git a/cps/admin.py b/cps/admin.py
index 51fddbee..a933f8bc 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -214,7 +214,7 @@ def admin():
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
             commit = format_datetime(form_date - tz, format='short')
         else:
-            commit = version['version']
+            commit = version['version'].replace("b", " Beta")
 
     all_user = ub.session.query(ub.User).all()
     # email_settings = mail_config.get_mail_settings()
diff --git a/cps/cli.py b/cps/cli.py
index e9b97b9d..855ad899 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -29,8 +29,8 @@ from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
-        return "Calibre-Web version: %s - unknown git-clone" % _STABLE_VERSION['version']
-    return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'], _NIGHTLY_VERSION[1])
+        return "Calibre-Web version: %s - unknown git-clone" % _STABLE_VERSION['version'].replace("b", " Beta")
+    return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'].replace("b", " Beta"), _NIGHTLY_VERSION[1])
 
 
 class CliParameter(object):
diff --git a/cps/constants.py b/cps/constants.py
index d8842e78..09f5cf53 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -173,7 +173,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher, pubdate, identifiers')
 
-STABLE_VERSION = {'version': '0.6.22 Beta'}
+STABLE_VERSION = {'version': '0.6.22b'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'