Fix version numbering in source autoupdating (remove leading v)
This commit is contained in:
parent
e0057ff14d
commit
76887a0edc
1 changed files with 10 additions and 7 deletions
|
@ -250,13 +250,16 @@ class AppAutoUpdater:
|
||||||
|
|
||||||
def apply_version_regex(tag: str) -> Optional[str]:
|
def apply_version_regex(tag: str) -> Optional[str]:
|
||||||
# First preprocessing according to the manifest version_regex…
|
# First preprocessing according to the manifest version_regex…
|
||||||
if not version_regex:
|
if version_regex:
|
||||||
return tag
|
match = re.match(version_regex, tag)
|
||||||
match = re.match(version_regex, tag)
|
if match is None:
|
||||||
if match is None:
|
return None
|
||||||
return None
|
# Basically: either groupdict if named capture gorups, sorted by names, or groups()
|
||||||
# Basically: either groupdict if named capture gorups, sorted by names, or groups()
|
tag = ".".join(dict(sorted(match.groupdict().items())).values() or match.groups())
|
||||||
return ".".join(dict(sorted(match.groupdict().items())).values() or match.groups())
|
|
||||||
|
# Then remove leading v
|
||||||
|
tag = tag.lstrip("v")
|
||||||
|
return tag
|
||||||
|
|
||||||
def version_numbers(tag: str) -> Optional[tuple[int, ...]]:
|
def version_numbers(tag: str) -> Optional[tuple[int, ...]]:
|
||||||
filter_keywords = ["start", "rc", "beta", "alpha"]
|
filter_keywords = ["start", "rc", "beta", "alpha"]
|
||||||
|
|
Loading…
Reference in a new issue