actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-16 15:46:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix get_repo_info for repo with .git suffix

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-07-15 00:18:54 +10:00
parent 1384623f63
commit af3eb35fee
No known key found for this signature in database
GPG key ID: 76D1E687CA3C4928
1 changed files with 47 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

80
crates/binstalk-fetchers/src/lib.rs
View file

@ -3,7 +3,7 @@
use std::{path::Path, sync::Arc, time::Duration}; use std::{path::Path, sync::Arc, time::Duration};
use binstalk_downloader::{download::DownloadError, remote::Error as RemoteError}; use binstalk_downloader::{download::DownloadError, remote::Error as RemoteError};
use binstalk_git_repo_api::gh_api_client::{GhApiError, GhRepo}; use binstalk_git_repo_api::gh_api_client::{GhApiError, GhRepo, RepoInfo as GhRepoInfo};
use binstalk_types::cargo_toml_binstall::SigningAlgorithm; use binstalk_types::cargo_toml_binstall::SigningAlgorithm;
use thiserror::Error as ThisError; use thiserror::Error as ThisError;
use tokio::{sync::OnceCell, task::JoinError, time::sleep}; use tokio::{sync::OnceCell, task::JoinError, time::sleep};
@ -185,6 +185,22 @@ impl Data {
#[instrument(skip(client))] #[instrument(skip(client))]
async fn get_repo_info(&self, client: &GhApiClient) -> Result<Option<&RepoInfo>, FetchError> { async fn get_repo_info(&self, client: &GhApiClient) -> Result<Option<&RepoInfo>, FetchError> {
async fn gh_get_repo_info(
client: &GhApiClient,
gh_repo: &GhRepo,
) -> Result<GhRepoInfo, GhApiError> {
loop {
match client.get_repo_info(gh_repo).await {
Ok(Some(gh_repo_info)) => break Ok(gh_repo_info),
Ok(None) => break Err(GhApiError::NotFound),
Err(GhApiError::RateLimit { retry_after }) => {
sleep(retry_after.unwrap_or(DEFAULT_GH_API_RETRY_DURATION)).await
}
Err(err) => break Err(err),
}
}
}
async fn get_repo_info_inner( async fn get_repo_info_inner(
repo: &str, repo: &str,
client: &GhApiClient, client: &GhApiClient,
@ -202,42 +218,40 @@ impl Data {
let subcrate = RepoInfo::detect_subcrate(&mut repo, repository_host); let subcrate = RepoInfo::detect_subcrate(&mut repo, repository_host);
let mut is_private = false; if let Some(repo) = repo
if repository_host == RepositoryHost::GitHub { .as_str()
// ensure the URL does not end with .git .strip_suffix(".git")
if repo.as_str().ends_with(".git") { .and_then(|s| Url::parse(s).ok())
let repo_name_segment = repo {
.path_segments() let repository_host = RepositoryHost::guess_git_hosting_services(&repo);
.expect("GitHub URLs always have a base") if repository_host == RepositoryHost::GitHub && client.has_gh_token() {
.last()
.expect("path_segments() always returns at least 1 element");
let repo_name = repo_name_segment.trim_end_matches(".git").to_owned();
repo.path_segments_mut()
.expect("GitHub URLs always have a base")
.pop()
.push(&repo_name);
}
if client.has_gh_token() {
if let Some(gh_repo) = GhRepo::try_extract_from_url(&repo) { if let Some(gh_repo) = GhRepo::try_extract_from_url(&repo) {
loop { if let Ok(gh_repo_info) = gh_get_repo_info(client, &gh_repo).await {
match client.get_repo_info(&gh_repo).await { return Ok(RepoInfo {
Ok(Some(gh_repo_info)) => { subcrate,
is_private = gh_repo_info.is_private(); repository_host,
break; repo,
} is_private: gh_repo_info.is_private(),
Ok(None) => return Err(GhApiError::NotFound.into()), });
Err(GhApiError::RateLimit { retry_after }) => {
sleep(retry_after.unwrap_or(DEFAULT_GH_API_RETRY_DURATION))
.await
}
Err(err) => return Err(err.into()),
}
} }
} }
} }
if let Ok(repo) = client.remote_client().get_redirected_final_url(repo).await {
return Ok(RepoInfo {
subcrate,
repository_host: RepositoryHost::guess_git_hosting_services(&repo),
repo,
is_private: false,
});
}
}
let mut is_private = false;
if repository_host == RepositoryHost::GitHub && client.has_gh_token() {
if let Some(gh_repo) = GhRepo::try_extract_from_url(&repo) {
is_private = gh_get_repo_info(client, &gh_repo).await?.is_private();
}
} }
Ok(RepoInfo { Ok(RepoInfo {