diff --git a/napalm_openwrt/firmware_mixin.py b/napalm_openwrt/firmware_mixin.py index 76452fa..5ffe1af 100644 --- a/napalm_openwrt/firmware_mixin.py +++ b/napalm_openwrt/firmware_mixin.py @@ -172,17 +172,48 @@ def _server_url(configured: str) -> str: def _later_line(overview: dict[str, Any], line: str, target: str) -> str | None: """The newest release of the newest later line that builds *target*.""" current = _version_key(line + ".0") - found: list[tuple[tuple[int, int, int, float], str]] = [] - for name, branch in (overview.get("branches") or {}).items(): - key = _version_key(str(name) + ".0") - if key is None or current is None or key[:2] <= current[:2]: - continue - if not _builds(branch, target): - continue - newest = _newest(list(branch.get("versions") or [])) + if current is None: + return None + later = [ + (key, str(name)) + for name in overview.get("branches") or {} + if (key := _version_key(f"{name}.0")) is not None and key[:2] > current[:2] + ] + for _key, name in sorted(later, reverse=True): + newest = _latest_of_line(overview, name, target) if newest is not None: - found.append((key, newest)) - return max(found)[1] if found else None + return newest + return None + + +def _latest_of_line(overview: dict[str, Any], line: str, target: str) -> str | None: + """The newest release of *line*, if the line builds *target*.""" + branch = (overview.get("branches") or {}).get(line) + if not isinstance(branch, dict) or not _builds(branch, target): + return None + return _newest(list(branch.get("versions") or [])) + + +def _offer( + overview: dict[str, Any], current: str, target: str, owut: bool +) -> FirmwareOfferDict | None: + """The offer for a device on release *current* (a release, see ``_VERSION``).""" + line = _line_of(current) + latest = _latest_of_line(overview, line, target) + key, latest_key = _version_key(current), _version_key(latest or "") + if key is None or latest is None or latest_key is None: + return None + offer: FirmwareOfferDict = { + "current_version": current, + "latest_version": latest, + "newer": latest_key > key, + } + if key[:2] >= _OWUT_SINCE: + offer["installable"] = owut + later = _later_line(overview, line, target) + if later is not None: + offer["latest_major_version"] = later + return offer class OpenWrtFirmwareMixin(FirmwareOfferMixin, FirmwareUpgradeMixin): @@ -219,31 +250,12 @@ class OpenWrtFirmwareMixin(FirmwareOfferMixin, FirmwareUpgradeMixin): release, server, owut = self._read_firmware_facts() current = release.get("DISTRIB_RELEASE", "") target = release.get("DISTRIB_TARGET", "") - key = _version_key(current) - if key is None or not target: + if _version_key(current) is None or not target: return None overview = _overview(server) if overview is None: return None - line = _line_of(current) - branch = (overview.get("branches") or {}).get(line) - if not isinstance(branch, dict) or not _builds(branch, target): - return None - latest = _newest(list(branch.get("versions") or [])) - latest_key = _version_key(latest) if latest else None - if latest is None or latest_key is None: - return None - offer: FirmwareOfferDict = { - "current_version": current, - "latest_version": latest, - "newer": latest_key > key, - } - if key[:2] >= _OWUT_SINCE: - offer["installable"] = owut - later = _later_line(overview, line, target) - if later is not None: - offer["latest_major_version"] = later - return offer + return _offer(overview, current, target, owut) def start_firmware_upgrade(self, version: str) -> None: """Start owut's upgrade to *version*; the device restarts at its end.