Refactor Data::get_repo_info

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-07-14 23:55:56 +10:00
parent 7eca355cc3
commit 1384623f63
No known key found for this signature in database
GPG key ID: 76D1E687CA3C4928

View file

@ -185,13 +185,10 @@ impl Data {
#[instrument(skip(client))]
async fn get_repo_info(&self, client: &GhApiClient) -> Result<Option<&RepoInfo>, FetchError> {
self.repo_info
.get_or_try_init(move || {
Box::pin(async move {
let Some(repo) = self.repo.as_deref() else {
return Ok(None);
};
async fn get_repo_info_inner(
repo: &str,
client: &GhApiClient,
) -> Result<RepoInfo, FetchError> {
let mut repo = Url::parse(repo)?;
let mut repository_host = RepositoryHost::guess_git_hosting_services(&repo);
@ -233,10 +230,7 @@ impl Data {
}
Ok(None) => return Err(GhApiError::NotFound.into()),
Err(GhApiError::RateLimit { retry_after }) => {
sleep(
retry_after
.unwrap_or(DEFAULT_GH_API_RETRY_DURATION),
)
sleep(retry_after.unwrap_or(DEFAULT_GH_API_RETRY_DURATION))
.await
}
Err(err) => return Err(err.into()),
@ -246,16 +240,28 @@ impl Data {
}
}
let repo_info = RepoInfo {
Ok(RepoInfo {
subcrate,
repo,
repository_host,
is_private,
})
}
self.repo_info
.get_or_try_init(move || {
Box::pin(async move {
let Some(repo) = self.repo.as_deref() else {
return Ok(None);
};
debug!("Resolved repo_info = {repo_info:#?}");
let ret = get_repo_info_inner(repo, client).await;
Ok(Some(repo_info))
if let Ok(repo_info) = &ret {
debug!("Resolved repo_info = {repo_info:#?}");
}
ret.map(Some)
})
})
.await