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

Encapsulate tempfile within uv run (#8114)

Browse source 
## Summary

Some follow-up refactors to confine all the remote URL downloading and
parsing to within the `uv run` target abstractions.
This commit is contained in:
Charlie Marsh 2024-10-11 01:41:38 +02:00 • committed by GitHub
parent d864e1dbe5
commit 455b64cd77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 154 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

69
crates/uv-scripts/src/lib.rs
View file

@ -22,7 +22,9 @@ pub enum Pep723Item {
/// A PEP 723 script read from disk.
Script(Pep723Script),
/// A PEP 723 script provided via `stdin`.
Stdin(Pep723Stdin),
Stdin(Pep723Metadata),
/// A PEP 723 script provided via a remote URL.
Remote(Pep723Metadata),
}
impl Pep723Item {
@ -30,7 +32,8 @@ impl Pep723Item {
pub fn metadata(&self) -> &Pep723Metadata {
match self {
Self::Script(script) => &script.metadata,
Self::Stdin(stdin) => &stdin.metadata,
Self::Stdin(metadata) => metadata,
Self::Remote(metadata) => metadata,
}
}
@ -38,7 +41,8 @@ impl Pep723Item {
pub fn into_metadata(self) -> Pep723Metadata {
match self {
Self::Script(script) => script.metadata,
Self::Stdin(stdin) => stdin.metadata,
Self::Stdin(metadata) => metadata,
Self::Remote(metadata) => metadata,
}
}
}
@ -182,29 +186,6 @@ impl Pep723Script {
}
}
/// A PEP 723 script, provided via `stdin`.
#[derive(Debug)]
pub struct Pep723Stdin {
metadata: Pep723Metadata,
}
impl Pep723Stdin {
/// Parse the PEP 723 `script` metadata from `stdin`.
pub fn parse(contents: &[u8]) -> Result<Option<Self>, Pep723Error> {
// Extract the `script` tag.
let ScriptTag { metadata, .. } = match ScriptTag::parse(contents) {
Ok(Some(tag)) => tag,
Ok(None) => return Ok(None),
Err(err) => return Err(err),
};
// Parse the metadata.
let metadata = Pep723Metadata::from_str(&metadata)?;
Ok(Some(Self { metadata }))
}
}
/// PEP 723 metadata as parsed from a `script` comment block.
///
/// See: <https://peps.python.org/pep-0723/>
@ -219,6 +200,42 @@ pub struct Pep723Metadata {
pub raw: String,
}
impl Pep723Metadata {
/// Parse the PEP 723 metadata from `stdin`.
pub fn parse(contents: &[u8]) -> Result<Option<Self>, Pep723Error> {
// Extract the `script` tag.
let ScriptTag { metadata, .. } = match ScriptTag::parse(contents) {
Ok(Some(tag)) => tag,
Ok(None) => return Ok(None),
Err(err) => return Err(err),
};
// Parse the metadata.
Ok(Some(Self::from_str(&metadata)?))
}
/// Read the PEP 723 `script` metadata from a Python file, if it exists.
///
/// See: <https://peps.python.org/pep-0723/>
pub async fn read(file: impl AsRef<Path>) -> Result<Option<Self>, Pep723Error> {
let contents = match fs_err::tokio::read(&file).await {
Ok(contents) => contents,
Err(err) if err.kind() == io::ErrorKind::NotFound => return Ok(None),
Err(err) => return Err(err.into()),
};
// Extract the `script` tag.
let ScriptTag { metadata, .. } = match ScriptTag::parse(&contents) {
Ok(Some(tag)) => tag,
Ok(None) => return Ok(None),
Err(err) => return Err(err),
};
// Parse the metadata.
Ok(Some(Self::from_str(&metadata)?))
}
}
impl FromStr for Pep723Metadata {
type Err = Pep723Error;