From 7599dbb79df040e273fd1eaa0e96de5d365ff5f5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 23 Nov 2023 03:04:31 -0600
Subject: [PATCH 01/12] Add notification about upgrade to admin page

---
 archivebox/core/urls.py              |  3 +-
 archivebox/templates/admin/base.html | 93 ++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 87261ae2..90544dbd 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,6 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
+from config import VERSION
 
 # print('DEBUG', settings.DEBUG)
 
@@ -30,7 +31,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls),
+    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION}}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 0592fa0a..b0979db5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -123,6 +123,99 @@
         </div>
 
         <script>
+            const installedVersion = "{{VERSION}}";
+
+            // get versions from GitHub
+            const github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases";
+
+            let release_data = fetch(github_releases_api)
+              .then(response => response.json())
+              .then(release_data => {
+                let upgradeVersion = findUpgradeVersion(installedVersion, release_data);
+                let currentVersion = findCurrentVersion(installedVersion, release_data);
+
+                const showBanner = localStorage.getItem("bannerDismissed") !== "true" && currentVersion.html_url !== upgradeVersion.html_url
+                if (showBanner) {
+                    createBanner(currentVersion, upgradeVersion);
+                }
+              })
+              .catch(error => {
+                console.error('Error fetching release data: ', error);
+              });
+
+            // finds the nearest stable version
+            function findCurrentVersion(currentVersionTagName, releaseData) {
+                for (let i = 0; i < releaseData.length; i++) {
+                    if (compareVersions(releaseData[i].tag_name, currentVersionTagName) <= 0) {
+                        return releaseData[i];
+                    }
+                }
+                return releaseData[releaseData.length - 1];
+            }
+
+            function findUpgradeVersion(currentVersionTagName, releaseData) {
+                for (let i = 0; i < releaseData.length; i++) {
+                    if (majorVersionDiff(releaseData[i].tag_name, currentVersionTagName) === 1) {
+                        return releaseData[i];
+                    }
+                }
+                return releaseData[0];
+            }
+
+            function createBanner(currentVersion, upgradeVersion) {
+                const banner = document.createElement('div');
+                banner.setAttribute('id', 'upgrade-banner');
+                banner.innerHTML = `
+                    There's a new version of ArchiveBox available!
+                    The next major version is <a href=${upgradeVersion.html_url}>${upgradeVersion.tag_name}</a>.
+                    Your current version is <a href=${currentVersion.html_url}>${installedVersion}</a>
+                    <p>
+                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
+                    </p>
+                    <button>
+                        <a href="#" onclick="dismissBanner()">Dismiss</a>
+                    </button>
+                `
+                document.body.appendChild(banner);
+            }
+
+
+            // dismisses the version banner and stores a cookie to prevent it from showing again
+            function dismissBanner() {
+                var banner = document.getElementById("version-banner");
+                banner.style.display = "none";
+                localStorage.setItem("bannerDismissed", "true");
+            }
+
+            function parseVersion(v) {
+                return v.replace(/^v/, '').split(".").map(Number);
+            }
+
+            // compares two version strings formatted like "vx.x.x" (where the x's are integers)
+            // and returns 1 if v1 is newer than v2, 0 if they're the same, and -1 
+            // if v1 is older than v2.
+            function compareVersions(v1, v2) {
+                let v1Parts = parseVersion(v1);
+                let v2Parts = parseVersion(v2);
+
+                for (let i = 0; i < 3; i++) {
+                    if (v1Parts[i] < v2Parts[i]) {
+                        return -1;
+                    }
+                    if (v1Parts[i] > v2Parts[i]) {
+                        return 1;
+                    }
+                }
+                return 0;
+            }
+
+            function majorVersionDiff(v1, v2) {
+                let v1Parts = parseVersion(v1);
+                let v2Parts = parseVersion(v2);
+
+                return v1Parts[1] - v2Parts[1];
+            }
+
             $ = django.jQuery;
             $.fn.reverse = [].reverse;
 

From a3fd8a8ecd2412bc4bd102f042214fbec6cec348 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Mon, 27 Nov 2023 22:56:30 -0600
Subject: [PATCH 02/12] Move version banner logic from JS to Python

Also adds CSS styling to banner.
---
 archivebox/config.py                 |  74 ++++++++++++++++++
 archivebox/core/urls.py              |   4 +-
 archivebox/templates/admin/base.html | 111 +++++++++------------------
 3 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 775be8e4..e0a1ccf5 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -30,6 +30,7 @@ import inspect
 import getpass
 import platform
 import shutil
+import requests
 import django
 from sqlite3 import dbapi2 as sqlite3
 
@@ -397,6 +398,55 @@ def get_commit_hash(config):
     except Exception:
         return None
 
+def get_version_releases(config):
+    """
+    returns a dictionary containing the GitHub release data for 
+    the recommended upgrade version and the currently installed version
+    """
+    github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases"
+    response = requests.get(github_releases_api)
+    if response.status_code != 200:
+        stderr('Failed to get release data from GitHub', color='lightyellow', config=config)
+        return None
+
+    releases = response.json()
+    installed_version = config['VERSION']
+    installed_version_parts = parse_tag_name(installed_version)
+
+    # find current version or nearest older version (to link to)
+    current_version = None
+    for i, release in enumerate(releases):
+        release_parts = parse_tag_name(release["tag_name"])
+        if compare_versions(release["tag_name"], installed_version) <= 0:
+            current_version = release
+            break
+
+    current_version = current_version if current_version else releases[-1]
+
+    # find upgrade version
+    upgrade_version = None
+    smallest_version_diff = parse_tag_name(releases[0]["tag_name"])[1]
+    for i, release in enumerate(releases):
+        release_parts = parse_tag_name(release["tag_name"])
+        major_version_diff = release_parts[1] - installed_version_parts[1]
+        if major_version_diff < smallest_version_diff:
+            smallest_version_diff = major_version_diff
+            if smallest_version_diff < 1:
+                break
+            upgrade_version = release
+
+    upgrade_version = upgrade_version if upgrade_version else releases[0]
+
+    return {"upgrade_version": upgrade_version, "current_version": current_version}
+
+def can_upgrade(config):
+    if config['VERSION_RELEASES']:
+        upgrade_version_tag = config['VERSION_RELEASES']['upgrade_version']['tag_name']
+        current_version_tag = config['VERSION_RELEASES']['current_version']['tag_name']
+        return compare_versions(upgrade_version_tag, current_version_tag) == 1
+    return False
+
+
 ############################## Derived Config ##################################
 
 
@@ -424,6 +474,8 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
 
     'ARCHIVEBOX_BINARY':        {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
     'VERSION':                  {'default': lambda c: get_version(c)},
+    'VERSION_RELEASES':         {'default': lambda c: get_version_releases(c)},
+    'CAN_UPGRADE':              {'default': lambda c: can_upgrade(c)},
     'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},
     
     'PYTHON_BINARY':            {'default': lambda c: sys.executable},
@@ -696,6 +748,28 @@ def load_config(defaults: ConfigDefaultDict,
 
 #     with open(os.path.join(config['OUTPUT_DIR'], CONFIG_FILENAME), 'w+') as f:
 
+def parse_tag_name(v):
+    """parses a version tag string formatted like 'vx.x.x'"""
+    v = re.sub(r"\+.*$", "", v) # in case version string ends with '+editable'
+    parts = re.sub(r"^v", "", v).split(".")
+    return [int(p) for p in parts]
+
+
+def compare_versions(v1, v2):
+    """
+    for two version strings v1 and v2, returns 1 if v1 is newer than v2,
+    0 if they're equivalent and -1 if v1 is older than v2.
+    """
+    v1Parts = parse_tag_name(v1)
+    v2Parts = parse_tag_name(v2)
+    for i in range(len(v1Parts)):
+        if v1Parts[i] < v2Parts[i]:
+            return -1
+
+        if v1Parts[i] > v2Parts[i]:
+            return 1
+    return 0
+
 
 # Logging Helpers
 def stdout(*args, color: Optional[str]=None, prefix: str='', config: Optional[ConfigDict]=None) -> None:
diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 90544dbd..1520710c 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,7 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
-from config import VERSION
+from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 
@@ -31,7 +31,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION}}),
+    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION, 'VERSION_RELEASES': VERSION_RELEASES, 'CAN_UPGRADE': CAN_UPGRADE}}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index b0979db5..7b00fae5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -12,7 +12,26 @@
         {% endblock %}
         
         <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
-        {% block extrastyle %}{% endblock %}
+        {% block extrastyle %}
+        <style>
+            #upgrade-banner {
+                position: fixed;
+                right: 20px;
+                bottom: 20px;
+                background-color: #f8f8f8;
+                color: #333333;
+                border: 2px solid #772948;
+                padding: 10px 20px;
+                z-index: 1000;
+                text-align: center;
+            }
+            #dismiss-btn {
+                background: #aa1e55;
+                color: white;
+                cursor: pointer;
+            }
+        </style>
+        {% endblock %}
         
         {% if LANGUAGE_BIDI %}
             <link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">
@@ -123,99 +142,39 @@
         </div>
 
         <script>
-            const installedVersion = "{{VERSION}}";
+            if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
+                let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
+                let upgradeVersionURL= "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                let currentVersionTag = "{{VERSION}}"
+                let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
-            // get versions from GitHub
-            const github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases";
-
-            let release_data = fetch(github_releases_api)
-              .then(response => response.json())
-              .then(release_data => {
-                let upgradeVersion = findUpgradeVersion(installedVersion, release_data);
-                let currentVersion = findCurrentVersion(installedVersion, release_data);
-
-                const showBanner = localStorage.getItem("bannerDismissed") !== "true" && currentVersion.html_url !== upgradeVersion.html_url
-                if (showBanner) {
-                    createBanner(currentVersion, upgradeVersion);
-                }
-              })
-              .catch(error => {
-                console.error('Error fetching release data: ', error);
-              });
-
-            // finds the nearest stable version
-            function findCurrentVersion(currentVersionTagName, releaseData) {
-                for (let i = 0; i < releaseData.length; i++) {
-                    if (compareVersions(releaseData[i].tag_name, currentVersionTagName) <= 0) {
-                        return releaseData[i];
-                    }
-                }
-                return releaseData[releaseData.length - 1];
+                createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
 
-            function findUpgradeVersion(currentVersionTagName, releaseData) {
-                for (let i = 0; i < releaseData.length; i++) {
-                    if (majorVersionDiff(releaseData[i].tag_name, currentVersionTagName) === 1) {
-                        return releaseData[i];
-                    }
-                }
-                return releaseData[0];
-            }
-
-            function createBanner(currentVersion, upgradeVersion) {
+            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL){
                 const banner = document.createElement('div');
                 banner.setAttribute('id', 'upgrade-banner');
                 banner.innerHTML = `
-                    There's a new version of ArchiveBox available!
-                    The next major version is <a href=${upgradeVersion.html_url}>${upgradeVersion.tag_name}</a>.
-                    Your current version is <a href=${currentVersion.html_url}>${installedVersion}</a>
+                    <p>There's a new version of ArchiveBox available!</p>
+                    Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
                     <p>
                     <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
                     </p>
-                    <button>
-                        <a href="#" onclick="dismissBanner()">Dismiss</a>
-                    </button>
+                    <button id="dismiss-btn">Dismiss</button>
                 `
                 document.body.appendChild(banner);
+                let dismissButton = document.querySelector("#dismiss-btn")
+                if (dismissButton) {
+                    dismissButton.addEventListener("click", dismissBanner)
+                }
             }
 
-
-            // dismisses the version banner and stores a cookie to prevent it from showing again
             function dismissBanner() {
-                var banner = document.getElementById("version-banner");
+                var banner = document.getElementById("upgrade-banner");
                 banner.style.display = "none";
                 localStorage.setItem("bannerDismissed", "true");
             }
 
-            function parseVersion(v) {
-                return v.replace(/^v/, '').split(".").map(Number);
-            }
-
-            // compares two version strings formatted like "vx.x.x" (where the x's are integers)
-            // and returns 1 if v1 is newer than v2, 0 if they're the same, and -1 
-            // if v1 is older than v2.
-            function compareVersions(v1, v2) {
-                let v1Parts = parseVersion(v1);
-                let v2Parts = parseVersion(v2);
-
-                for (let i = 0; i < 3; i++) {
-                    if (v1Parts[i] < v2Parts[i]) {
-                        return -1;
-                    }
-                    if (v1Parts[i] > v2Parts[i]) {
-                        return 1;
-                    }
-                }
-                return 0;
-            }
-
-            function majorVersionDiff(v1, v2) {
-                let v1Parts = parseVersion(v1);
-                let v2Parts = parseVersion(v2);
-
-                return v1Parts[1] - v2Parts[1];
-            }
-
             $ = django.jQuery;
             $.fn.reverse = [].reverse;
 

From ba4342dadf9d026b2baaea9b51819af540f40215 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Mon, 27 Nov 2023 22:58:13 -0600
Subject: [PATCH 03/12] Add CLI hints to add and schedule jobs

---
 archivebox/main.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/archivebox/main.py b/archivebox/main.py
index b0e45bac..7abf3b4e 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -97,6 +97,8 @@ from .config import (
     check_data_folder,
     write_config_file,
     VERSION,
+    VERSION_RELEASES,
+    CAN_UPGRADE,
     COMMIT_HASH,
     CODE_LOCATIONS,
     EXTERNAL_LOCATIONS,
@@ -681,6 +683,9 @@ def add(urls: Union[str, List[str]],
             snapshot.save()
         # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
 
+    if CAN_UPGRADE:
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+
 
     return all_links
 
@@ -1270,6 +1275,9 @@ def schedule(add: bool=False,
                 print('\n{green}[√] Stopped.{reset}'.format(**ANSI))
                 raise SystemExit(1)
 
+    if CAN_UPGRADE:
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+
     
 @enforce_types
 def server(runserver_args: Optional[List[str]]=None,

From 8616cd758a04dbf2c13b5a113983a017a75061c4 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 18:06:54 -0600
Subject: [PATCH 04/12] Fix typos, formatting, and variable declarations

Co-authored-by: Nick Sweeting <git@sweeting.me>
---
 archivebox/config.py                 |  2 +-
 archivebox/templates/admin/base.html | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index e0a1ccf5..2195f50c 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -403,7 +403,7 @@ def get_version_releases(config):
     returns a dictionary containing the GitHub release data for 
     the recommended upgrade version and the currently installed version
     """
-    github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases"
+    github_releases_api = "https://api.github.com/repos/ArchiveBox/ArchiveBox/releases"
     response = requests.get(github_releases_api)
     if response.status_code != 200:
         stderr('Failed to get release data from GitHub', color='lightyellow', config=config)
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 7b00fae5..5e84d9bc 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -144,15 +144,15 @@
         <script>
             if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
                 let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
-                let upgradeVersionURL= "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
                 let currentVersionTag = "{{VERSION}}"
                 let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
 
-            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL){
-                const banner = document.createElement('div');
+            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL) {
+                const banner = document.createElement('div')
                 banner.setAttribute('id', 'upgrade-banner');
                 banner.innerHTML = `
                     <p>There's a new version of ArchiveBox available!</p>
@@ -163,16 +163,16 @@
                     <button id="dismiss-btn">Dismiss</button>
                 `
                 document.body.appendChild(banner);
-                let dismissButton = document.querySelector("#dismiss-btn")
+                const dismissButton = document.querySelector("#dismiss-btn")
                 if (dismissButton) {
                     dismissButton.addEventListener("click", dismissBanner)
                 }
             }
 
             function dismissBanner() {
-                var banner = document.getElementById("upgrade-banner");
-                banner.style.display = "none";
-                localStorage.setItem("bannerDismissed", "true");
+                const banner = document.getElementById("upgrade-banner")
+                banner.style.display = "none"
+                localStorage.setItem("bannerDismissed", "true")
             }
 
             $ = django.jQuery;

From 4ae35c86f274e22b13f27ad89db675bf78e2d7b5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 19:53:20 -0600
Subject: [PATCH 05/12] Update archivebox/config.py

Co-authored-by: Nick Sweeting <git@sweeting.me>
---
 archivebox/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 2195f50c..fbcbca03 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -415,7 +415,7 @@ def get_version_releases(config):
 
     # find current version or nearest older version (to link to)
     current_version = None
-    for i, release in enumerate(releases):
+    for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
         if compare_versions(release["tag_name"], installed_version) <= 0:
             current_version = release

From 25d7f3ed1c5442811f771fba89a3f0be52468916 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 19:57:46 -0600
Subject: [PATCH 06/12] Parse without regex and change 'let' to 'const'

---
 archivebox/config.py                 |  8 ++++----
 archivebox/templates/admin/base.html | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index fbcbca03..c8a40c30 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -426,7 +426,7 @@ def get_version_releases(config):
     # find upgrade version
     upgrade_version = None
     smallest_version_diff = parse_tag_name(releases[0]["tag_name"])[1]
-    for i, release in enumerate(releases):
+    for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
         major_version_diff = release_parts[1] - installed_version_parts[1]
         if major_version_diff < smallest_version_diff:
@@ -750,9 +750,9 @@ def load_config(defaults: ConfigDefaultDict,
 
 def parse_tag_name(v):
     """parses a version tag string formatted like 'vx.x.x'"""
-    v = re.sub(r"\+.*$", "", v) # in case version string ends with '+editable'
-    parts = re.sub(r"^v", "", v).split(".")
-    return [int(p) for p in parts]
+    base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
+    int_parts = [int(part) for part in base.split('.')]
+    return int_parts
 
 
 def compare_versions(v1, v2):
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 5e84d9bc..7c31d83a 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -142,11 +142,12 @@
         </div>
 
         <script>
-            if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
-                let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
+            {% if user.is_authenticated and CAN_UPGRADE %}
+            if (!localStorage.getItem("bannerDismissed")) {
+                const upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
                 const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
-                let currentVersionTag = "{{VERSION}}"
-                let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
+                const currentVersionTag = "{{VERSION}}"
+                const currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
@@ -174,6 +175,7 @@
                 banner.style.display = "none"
                 localStorage.setItem("bannerDismissed", "true")
             }
+            {% endif %}
 
             $ = django.jQuery;
             $.fn.reverse = [].reverse;

From a2b11b696d871db6112a74f27a777eefb69f3fc5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Fri, 1 Dec 2023 16:55:07 -0600
Subject: [PATCH 07/12] Remove version comparison function

---
 archivebox/config.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index c8a40c30..b724b2cf 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -417,7 +417,7 @@ def get_version_releases(config):
     current_version = None
     for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
-        if compare_versions(release["tag_name"], installed_version) <= 0:
+        if release_parts <= installed_version_parts :
             current_version = release
             break
 
@@ -441,9 +441,9 @@ def get_version_releases(config):
 
 def can_upgrade(config):
     if config['VERSION_RELEASES']:
-        upgrade_version_tag = config['VERSION_RELEASES']['upgrade_version']['tag_name']
-        current_version_tag = config['VERSION_RELEASES']['current_version']['tag_name']
-        return compare_versions(upgrade_version_tag, current_version_tag) == 1
+        upgrade_version = parse_tag_name(config['VERSION_RELEASES']['upgrade_version']['tag_name'])
+        current_version = parse_tag_name(config['VERSION_RELEASES']['current_version']['tag_name'])
+        return upgrade_version > current_version
     return False
 
 
@@ -751,24 +751,7 @@ def load_config(defaults: ConfigDefaultDict,
 def parse_tag_name(v):
     """parses a version tag string formatted like 'vx.x.x'"""
     base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
-    int_parts = [int(part) for part in base.split('.')]
-    return int_parts
-
-
-def compare_versions(v1, v2):
-    """
-    for two version strings v1 and v2, returns 1 if v1 is newer than v2,
-    0 if they're equivalent and -1 if v1 is older than v2.
-    """
-    v1Parts = parse_tag_name(v1)
-    v2Parts = parse_tag_name(v2)
-    for i in range(len(v1Parts)):
-        if v1Parts[i] < v2Parts[i]:
-            return -1
-
-        if v1Parts[i] > v2Parts[i]:
-            return 1
-    return 0
+    return tuple(int(part) for part in base.split('.'))
 
 
 # Logging Helpers

From 480eff52db6dc0f9e6c8c2a0109b6a48a38bc474 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 09:58:15 -0800
Subject: [PATCH 08/12] Update urls.py

---
 archivebox/core/urls.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 1520710c..8746083d 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -12,6 +12,8 @@ from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 
+GLOBAL_CONTEXT = {'VERSION': VERSION, 'VERSIONS_AVAILABLE': VERSIONS_AVAILABLE, 'CAN_UPGRADE': CAN_UPGRADE}
+
 urlpatterns = [
     path('public/', PublicIndexView.as_view(), name='public-index'),
 
@@ -31,7 +33,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION, 'VERSION_RELEASES': VERSION_RELEASES, 'CAN_UPGRADE': CAN_UPGRADE}}),
+    path('admin/', admin.site.urls, {'extra_context': GLOBAL_CONTEXT}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),

From 168cdac2c4acc36a99598c0f8e0ef90587764561 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 09:58:42 -0800
Subject: [PATCH 09/12] rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/core/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 8746083d..1f3732d5 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,7 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
-from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
+from config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 

From 42dad5e0b3999f82100a75c64fb2284094df8488 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:01:08 -0800
Subject: [PATCH 10/12] rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/main.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/archivebox/main.py b/archivebox/main.py
index e47d20fe..d80203b2 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -99,7 +99,7 @@ from .config import (
     check_data_folder,
     write_config_file,
     VERSION,
-    VERSION_RELEASES,
+    VERSIONS_AVAILABLE,
     CAN_UPGRADE,
     COMMIT_HASH,
     BUILD_TIME,
@@ -695,8 +695,7 @@ def add(urls: Union[str, List[str]],
         # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
 
     if CAN_UPGRADE:
-        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
-
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSIONS_AVAILABLE['recommended_version']['tag_name']} ({VERSIONS_AVAILABLE['recommended_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
 
     return all_links
 
@@ -1287,7 +1286,7 @@ def schedule(add: bool=False,
                 raise SystemExit(1)
 
     if CAN_UPGRADE:
-        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSIONS_AVAILABLE['recommended_version']['tag_name']} ({VERSIONS_AVAILABLE['recommended_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
 
     
 @enforce_types

From bfebc23f42c9250a56b27d1784f7c5714cf8d8b6 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:02:28 -0800
Subject: [PATCH 11/12] Rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/templates/admin/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 7c31d83a..9d2601af 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -144,10 +144,10 @@
         <script>
             {% if user.is_authenticated and CAN_UPGRADE %}
             if (!localStorage.getItem("bannerDismissed")) {
-                const upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
-                const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
+                const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
                 const currentVersionTag = "{{VERSION}}"
-                const currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
+                const currentVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
@@ -159,7 +159,7 @@
                     <p>There's a new version of ArchiveBox available!</p>
                     Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
                     <p>
-                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
+                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrade Instructions</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
                     </p>
                     <button id="dismiss-btn">Dismiss</button>
                 `

From bfcff2f78f6c0c11742a37cb99f1b0b3fbc0ce7d Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:03:04 -0800
Subject: [PATCH 12/12] make sure user is a superuser before showing upgrade
 notification

---
 archivebox/templates/admin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 9d2601af..c905884c 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -142,7 +142,7 @@
         </div>
 
         <script>
-            {% if user.is_authenticated and CAN_UPGRADE %}
+            {% if user.is_authenticated and user.is_superuser and CAN_UPGRADE %}
             if (!localStorage.getItem("bannerDismissed")) {
                 const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
                 const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"