mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-21 02:15:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Parse without regex and change 'let' to 'const'

Browse source
This commit is contained in:
Ben Muthalaly 2023-11-30 19:57:46 -06:00
parent 4ae35c86f2
commit 25d7f3ed1c
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
archivebox/config.py
View file

@ -426,7 +426,7 @@ def get_version_releases(config):
# find upgrade version # find upgrade version
upgrade_version = None upgrade_version = None
smallest_version_diff = parse_tag_name(releases[0]["tag_name"])[1] 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"]) release_parts = parse_tag_name(release["tag_name"])
major_version_diff = release_parts[1] - installed_version_parts[1] major_version_diff = release_parts[1] - installed_version_parts[1]
if major_version_diff < smallest_version_diff: if major_version_diff < smallest_version_diff:
@ -750,9 +750,9 @@ def load_config(defaults: ConfigDefaultDict,
def parse_tag_name(v): def parse_tag_name(v):
"""parses a version tag string formatted like 'vx.x.x'""" """parses a version tag string formatted like 'vx.x.x'"""
v = re.sub(r"\+.*$", "", v) # in case version string ends with '+editable' base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
parts = re.sub(r"^v", "", v).split(".") int_parts = [int(part) for part in base.split('.')]
return [int(p) for p in parts] return int_parts
def compare_versions(v1, v2): def compare_versions(v1, v2):

10
archivebox/templates/admin/base.html
View file

@ -142,11 +142,12 @@
</div> </div>
<script> <script>
if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) { {% if user.is_authenticated and CAN_UPGRADE %}
let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}" if (!localStorage.getItem("bannerDismissed")) {
const upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}" const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
let currentVersionTag = "{{VERSION}}" const currentVersionTag = "{{VERSION}}"
let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}" const currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL) createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
} }
@ -174,6 +175,7 @@
banner.style.display = "none" banner.style.display = "none"
localStorage.setItem("bannerDismissed", "true") localStorage.setItem("bannerDismissed", "true")
} }
{% endif %}
$ = django.jQuery; $ = django.jQuery;
$.fn.reverse = [].reverse; $.fn.reverse = [].reverse;