hosting/ynh-apps_tools
1
0
Fork 0
Code Activity

autoupdater: Call infos.get("autoupdate") way sooner for cleaner code

Browse source
This commit is contained in:
Félix Piédallu 2024-02-16 22:10:00 +01:00
parent 189462259c
commit 7d4402e9c2
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
autoupdate_app_sources/autoupdate_app_sources.py
View file

@ -297,16 +297,17 @@ class AppAutoUpdater:
def get_source_update(self, name: str, infos: dict[str, Any] def get_source_update(self, name: str, infos: dict[str, Any]
) -> Optional[tuple[str, Union[str, dict[str, str]], str]]: ) -> Optional[tuple[str, Union[str, dict[str, str]], str]]:
if "autoupdate" not in infos: autoupdate = infos.get("autoupdate")
if autoupdate is None:
return None return None
print(f"\n Checking {name} ...") print(f"\n Checking {name} ...")
asset = infos.get("autoupdate", {}).get("asset", "tarball") asset = autoupdate.get("asset", "tarball")
strategy = infos.get("autoupdate", {}).get("strategy") strategy = autoupdate.get("strategy")
if strategy not in STRATEGIES: if strategy not in STRATEGIES:
raise ValueError(f"Unknown update strategy '{strategy}' for '{name}', expected one of {STRATEGIES}") raise ValueError(f"Unknown update strategy '{strategy}' for '{name}', expected one of {STRATEGIES}")
result = self.get_latest_version_and_asset(strategy, asset, infos) result = self.get_latest_version_and_asset(strategy, asset, autoupdate)
if result is None: if result is None:
return None return None
new_version, assets, more_info = result new_version, assets, more_info = result
@ -358,9 +359,9 @@ class AppAutoUpdater:
raise RuntimeError(f"Too many assets matching regex '{regex}': {matching_assets}") raise RuntimeError(f"Too many assets matching regex '{regex}': {matching_assets}")
return next(iter(matching_assets.items())) return next(iter(matching_assets.items()))
def get_latest_version_and_asset(self, strategy: str, asset: Union[str, dict], infos def get_latest_version_and_asset(self, strategy: str, asset: Union[str, dict], autoupdate
) -> Optional[tuple[str, Union[str, dict[str, str]], str]]: ) -> Optional[tuple[str, Union[str, dict[str, str]], str]]:
upstream = (infos.get("autoupdate", {}).get("upstream", self.main_upstream).strip("/")) upstream = autoupdate.get("upstream", self.main_upstream).strip("/")
_, remote_type, revision_type = strategy.split("_") _, remote_type, revision_type = strategy.split("_")
api: Union[GithubAPI, GitlabAPI, GiteaForgejoAPI] api: Union[GithubAPI, GitlabAPI, GiteaForgejoAPI]
@ -431,7 +432,7 @@ class AppAutoUpdater:
latest_tarball = api.url_for_ref(latest_commit["sha"], RefType.commits) latest_tarball = api.url_for_ref(latest_commit["sha"], RefType.commits)
# Let's have the version as something like "2023.01.23" # Let's have the version as something like "2023.01.23"
latest_commit_date = datetime.strptime(latest_commit["commit"]["author"]["date"][:10], "%Y-%m-%d") latest_commit_date = datetime.strptime(latest_commit["commit"]["author"]["date"][:10], "%Y-%m-%d")
version_format = infos.get("autoupdate", {}).get("force_version", "%Y.%m.%d") version_format = autoupdate.get("force_version", "%Y.%m.%d")
latest_version = latest_commit_date.strftime(version_format) latest_version = latest_commit_date.strftime(version_format)
return latest_version, latest_tarball, "" return latest_version, latest_tarball, ""
return None return None