Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove timestamp exact vs. approximate enum (#7098)

This commit is contained in:
Charlie Marsh 2024-09-05 16:49:20 -04:00 committed by GitHub
parent 5b89734c85
commit f2309bfd1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/uv-cache/src/lib.rs
View File

@ -899,14 +899,11 @@ impl Display for CacheBucket {
} }
} }
/// A timestamp for an archive, which could be a directory (in which case the modification time is
/// the latest modification time of the `pyproject.toml`, `setup.py`, or `setup.cfg` file in the
/// directory) or a single file.
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum ArchiveTimestamp { pub struct ArchiveTimestamp(Timestamp);
/// The archive consists of a single file with the given modification time.
Exact(Timestamp),
/// The archive consists of a directory. The modification time is the latest modification time
/// of the `pyproject.toml` or `setup.py` file in the directory.
Approximate(Timestamp),
}
impl ArchiveTimestamp { impl ArchiveTimestamp {
/// Return the modification timestamp for an archive, which could be a file (like a wheel or a zip /// Return the modification timestamp for an archive, which could be a file (like a wheel or a zip
@ -917,7 +914,7 @@ impl ArchiveTimestamp {
pub fn from_path(path: impl AsRef<Path>) -> Result<Option<Self>, io::Error> { pub fn from_path(path: impl AsRef<Path>) -> Result<Option<Self>, io::Error> {
let metadata = fs_err::metadata(path.as_ref())?; let metadata = fs_err::metadata(path.as_ref())?;
if metadata.is_file() { if metadata.is_file() {
Ok(Some(Self::Exact(Timestamp::from_metadata(&metadata)))) Ok(Some(Self(Timestamp::from_metadata(&metadata))))
} else { } else {
Self::from_source_tree(path) Self::from_source_tree(path)
} }
@ -926,7 +923,7 @@ impl ArchiveTimestamp {
/// Return the modification timestamp for a file. /// Return the modification timestamp for a file.
pub fn from_file(path: impl AsRef<Path>) -> Result<Self, io::Error> { pub fn from_file(path: impl AsRef<Path>) -> Result<Self, io::Error> {
let metadata = fs_err::metadata(path.as_ref())?; let metadata = fs_err::metadata(path.as_ref())?;
Ok(Self::Exact(Timestamp::from_metadata(&metadata))) Ok(Self(Timestamp::from_metadata(&metadata)))
} }
/// Return the modification timestamp for a source tree, i.e., a directory. /// Return the modification timestamp for a source tree, i.e., a directory.
@ -968,15 +965,12 @@ impl ArchiveTimestamp {
return Ok(None); return Ok(None);
}; };
Ok(Some(Self::Approximate(timestamp))) Ok(Some(Self(timestamp)))
} }
/// Return the modification timestamp for an archive. /// Return the modification timestamp for an archive.
pub fn timestamp(&self) -> Timestamp { pub fn timestamp(&self) -> Timestamp {
match self { self.0
Self::Exact(timestamp) => *timestamp,
Self::Approximate(timestamp) => *timestamp,
}
} }
/// Returns `true` if the `target` (an installed or cached distribution) is up-to-date with the /// Returns `true` if the `target` (an installed or cached distribution) is up-to-date with the