mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-01 20:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Dedicated error type for direct url parsing (#3181)

Browse source 
Add a dedicated error type for direct url parsing. This change is broken
out from the new uv requirement type, which uses direct url parsing
internally.
This commit is contained in:
konsti 2024-04-22 13:57:36 +02:00 • committed by GitHub
parent 0e54cfb019
commit f29c991e21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/distribution-types/Cargo.toml
View file

@ -25,6 +25,7 @@ uv-normalize = { workspace = true }
anyhow = { workspace = true }
fs-err = { workspace = true }
git2 = { workspace = true }
itertools = { workspace = true }
once_cell = { workspace = true }
rkyv = { workspace = true }

2
crates/distribution-types/src/cached.rs
View file

@ -116,7 +116,7 @@ impl CachedDist {
editable: dist.editable,
})))
} else {
DirectUrl::try_from(dist.url.raw()).map(Some)
Ok(Some(DirectUrl::try_from(dist.url.raw())?))
}
}
}

42
crates/distribution-types/src/direct_url.rs
View file

@ -1,10 +1,24 @@
use anyhow::{Error, Result};
use std::path::PathBuf;
use anyhow::{Context, Error, Result};
use thiserror::Error;
use url::Url;
use uv_git::{GitSha, GitUrl};
#[derive(Debug, Error)]
pub enum DirectUrlError {
#[error("Unsupported URL prefix `{prefix}` in URL: `{url}`")]
UnsupportedUrlPrefix { prefix: String, url: Url },
#[error("Invalid path in file URL: `{0}`")]
InvalidFileUrl(Url),
#[error("Failed to parse Git reference from URL: `{0}`")]
GitShaParse(Url, #[source] git2::Error),
#[error("Not a valid URL: `{0}`")]
UrlParse(String, #[source] url::ParseError),
#[error("Missing `git+` prefix for Git URL: `{0}`")]
MissingUrlPrefix(Url),
}
#[derive(Debug)]
pub enum DirectUrl {
/// The direct URL is a path to a local directory or file.
@ -49,17 +63,18 @@ pub struct DirectArchiveUrl {
}
impl TryFrom<&Url> for DirectGitUrl {
type Error = Error;
type Error = DirectUrlError;
fn try_from(url: &Url) -> Result<Self, Self::Error> {
let subdirectory = get_subdirectory(url);
fn try_from(url_in: &Url) -> Result<Self, Self::Error> {
let subdirectory = get_subdirectory(url_in);
let url = url
let url = url_in
.as_str()
.strip_prefix("git+")
.context("Missing git+ prefix for Git URL")?;
let url = Url::parse(url)?;
let url = GitUrl::try_from(url)?;
.ok_or_else(|| DirectUrlError::MissingUrlPrefix(url_in.clone()))?;
let url = Url::parse(url).map_err(|err| DirectUrlError::UrlParse(url.to_string(), err))?;
let url = GitUrl::try_from(url)
.map_err(|err| DirectUrlError::GitShaParse(url_in.clone(), err))?;
Ok(Self { url, subdirectory })
}
}
@ -94,15 +109,16 @@ pub fn git_reference(url: &Url) -> Result<Option<GitSha>, Error> {
}
impl TryFrom<&Url> for DirectUrl {
type Error = Error;
type Error = DirectUrlError;
fn try_from(url: &Url) -> Result<Self, Self::Error> {
if let Some((prefix, ..)) = url.scheme().split_once('+') {
match prefix {
"git" => Ok(Self::Git(DirectGitUrl::try_from(url)?)),
_ => Err(Error::msg(format!(
"Unsupported URL prefix `{prefix}` in URL: {url}",
))),
_ => Err(DirectUrlError::UnsupportedUrlPrefix {
prefix: prefix.to_string(),
url: url.clone(),
}),
}
} else if url.scheme().eq_ignore_ascii_case("file") {
Ok(Self::LocalFile(LocalFileUrl {