feat: improve updater flow and release channels
Some checks failed
Desktop Dev Pre-release / prerelease (push) Failing after 2m18s
Some checks failed
Desktop Dev Pre-release / prerelease (push) Failing after 2m18s
- added dedicated GUI updater executable and integrated launch path from main app - added stable/beta update channel selection with persisted settings and checker support - expanded CI/release validation to include updater and full test discovery
This commit is contained in:
@@ -38,6 +38,75 @@ def _sanitize_repo_url(value):
|
||||
return f"{parsed.scheme}://{parsed.netloc}{clean_path}"
|
||||
|
||||
|
||||
def _normalize_update_channel(value):
|
||||
channel = (value or "").strip().lower()
|
||||
if channel in ("beta", "betas", "pre", "prerelease", "pre-release"):
|
||||
return "beta"
|
||||
return "stable"
|
||||
|
||||
|
||||
def _select_release_from_list(releases):
|
||||
for item in releases:
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
if item.get("draft"):
|
||||
continue
|
||||
tag_name = (item.get("tag_name") or item.get("name") or "").strip()
|
||||
if not tag_name:
|
||||
continue
|
||||
return item
|
||||
return None
|
||||
|
||||
|
||||
def _extract_release_payload(release_data, repository_url, current_version):
|
||||
parsed = urlparse(repository_url)
|
||||
base_url = f"{parsed.scheme}://{parsed.netloc}"
|
||||
repo_path = parsed.path.strip("/")
|
||||
releases_url = f"{base_url}/{repo_path}/releases"
|
||||
|
||||
latest_tag = release_data.get("tag_name") or release_data.get("name") or ""
|
||||
latest_version = latest_tag.lstrip("vV").strip()
|
||||
html_url = release_data.get("html_url") or releases_url
|
||||
assets = release_data.get("assets") or []
|
||||
download_url = ""
|
||||
download_name = ""
|
||||
checksum_url = ""
|
||||
for asset in assets:
|
||||
url = asset.get("browser_download_url", "")
|
||||
if url.lower().endswith(".zip"):
|
||||
download_url = url
|
||||
download_name = asset.get("name", "")
|
||||
break
|
||||
if not download_url and assets:
|
||||
download_url = assets[0].get("browser_download_url", "")
|
||||
download_name = assets[0].get("name", "")
|
||||
|
||||
for asset in assets:
|
||||
name = asset.get("name", "").lower()
|
||||
if not name:
|
||||
continue
|
||||
is_checksum_asset = name.endswith(".sha256") or name.endswith(".sha256.txt") or name in ("checksums.txt", "sha256sums.txt")
|
||||
if not is_checksum_asset:
|
||||
continue
|
||||
if download_name and (download_name.lower() in name or name in (f"{download_name.lower()}.sha256", f"{download_name.lower()}.sha256.txt")):
|
||||
checksum_url = asset.get("browser_download_url", "")
|
||||
break
|
||||
if not checksum_url:
|
||||
checksum_url = asset.get("browser_download_url", "")
|
||||
|
||||
return {
|
||||
"repository_url": repository_url,
|
||||
"latest_version": latest_version,
|
||||
"current_version": current_version,
|
||||
"latest_tag": latest_tag,
|
||||
"release_url": html_url,
|
||||
"download_url": download_url,
|
||||
"download_name": download_name,
|
||||
"checksum_url": checksum_url,
|
||||
"has_update": _is_newer_version(latest_version, current_version),
|
||||
}
|
||||
|
||||
|
||||
def detect_update_repository_url(configured_url="", configured_repo=""):
|
||||
env_url = _sanitize_repo_url(os.getenv("ANABASIS_UPDATE_URL", ""))
|
||||
if env_url:
|
||||
@@ -74,11 +143,12 @@ class UpdateChecker(QObject):
|
||||
check_finished = Signal(dict)
|
||||
check_failed = Signal(str)
|
||||
|
||||
def __init__(self, repository_url, current_version, request_timeout=8):
|
||||
def __init__(self, repository_url, current_version, request_timeout=8, channel="stable"):
|
||||
super().__init__()
|
||||
self.repository_url = repository_url
|
||||
self.current_version = current_version
|
||||
self.request_timeout = request_timeout
|
||||
self.channel = _normalize_update_channel(channel)
|
||||
|
||||
def run(self):
|
||||
if not self.repository_url:
|
||||
@@ -92,10 +162,17 @@ class UpdateChecker(QObject):
|
||||
self.check_failed.emit("Некорректный URL репозитория обновлений.")
|
||||
return
|
||||
|
||||
use_beta_channel = self.channel == "beta"
|
||||
if parsed.netloc.lower().endswith("github.com"):
|
||||
api_url = f"https://api.github.com/repos/{repo_path}/releases/latest"
|
||||
if use_beta_channel:
|
||||
api_url = f"https://api.github.com/repos/{repo_path}/releases"
|
||||
else:
|
||||
api_url = f"https://api.github.com/repos/{repo_path}/releases/latest"
|
||||
else:
|
||||
api_url = f"{base_url}/api/v1/repos/{repo_path}/releases/latest"
|
||||
if use_beta_channel:
|
||||
api_url = f"{base_url}/api/v1/repos/{repo_path}/releases"
|
||||
else:
|
||||
api_url = f"{base_url}/api/v1/repos/{repo_path}/releases/latest"
|
||||
releases_url = f"{base_url}/{repo_path}/releases"
|
||||
request = urllib.request.Request(
|
||||
api_url,
|
||||
@@ -106,7 +183,7 @@ class UpdateChecker(QObject):
|
||||
)
|
||||
try:
|
||||
with urllib.request.urlopen(request, timeout=self.request_timeout) as response:
|
||||
release_data = json.loads(response.read().decode("utf-8"))
|
||||
response_data = json.loads(response.read().decode("utf-8"))
|
||||
except urllib.error.HTTPError as e:
|
||||
self.check_failed.emit(f"Ошибка HTTP при проверке обновлений: {e.code}")
|
||||
return
|
||||
@@ -117,47 +194,20 @@ class UpdateChecker(QObject):
|
||||
self.check_failed.emit(f"Не удалось проверить обновления: {e}")
|
||||
return
|
||||
|
||||
latest_tag = release_data.get("tag_name") or release_data.get("name") or ""
|
||||
latest_version = latest_tag.lstrip("vV").strip()
|
||||
html_url = release_data.get("html_url") or releases_url
|
||||
assets = release_data.get("assets") or []
|
||||
download_url = ""
|
||||
download_name = ""
|
||||
checksum_url = ""
|
||||
for asset in assets:
|
||||
url = asset.get("browser_download_url", "")
|
||||
if url.lower().endswith(".zip"):
|
||||
download_url = url
|
||||
download_name = asset.get("name", "")
|
||||
break
|
||||
if not download_url and assets:
|
||||
download_url = assets[0].get("browser_download_url", "")
|
||||
download_name = assets[0].get("name", "")
|
||||
|
||||
for asset in assets:
|
||||
name = asset.get("name", "").lower()
|
||||
if not name:
|
||||
continue
|
||||
is_checksum_asset = name.endswith(".sha256") or name.endswith(".sha256.txt") or name in ("checksums.txt", "sha256sums.txt")
|
||||
if not is_checksum_asset:
|
||||
continue
|
||||
if download_name and (download_name.lower() in name or name in (f"{download_name.lower()}.sha256", f"{download_name.lower()}.sha256.txt")):
|
||||
checksum_url = asset.get("browser_download_url", "")
|
||||
break
|
||||
if not checksum_url:
|
||||
checksum_url = asset.get("browser_download_url", "")
|
||||
|
||||
self.check_finished.emit(
|
||||
{
|
||||
"repository_url": self.repository_url,
|
||||
"latest_version": latest_version,
|
||||
"current_version": self.current_version,
|
||||
"latest_tag": latest_tag,
|
||||
"release_url": html_url,
|
||||
"download_url": download_url,
|
||||
"download_name": download_name,
|
||||
"checksum_url": checksum_url,
|
||||
"has_update": _is_newer_version(latest_version, self.current_version),
|
||||
}
|
||||
)
|
||||
release_data = response_data
|
||||
if use_beta_channel:
|
||||
if not isinstance(response_data, list):
|
||||
self.check_failed.emit("Сервер вернул некорректный ответ списка релизов.")
|
||||
return
|
||||
release_data = _select_release_from_list(response_data)
|
||||
if not release_data:
|
||||
self.check_failed.emit("В канале beta не найдено доступных релизов.")
|
||||
return
|
||||
elif not isinstance(response_data, dict):
|
||||
self.check_failed.emit("Сервер вернул некорректный ответ релиза.")
|
||||
return
|
||||
|
||||
payload = _extract_release_payload(release_data, self.repository_url, self.current_version)
|
||||
payload["release_channel"] = self.channel
|
||||
payload["releases_url"] = releases_url
|
||||
self.check_finished.emit(payload)
|
||||
|
||||
Reference in New Issue
Block a user