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

Rename metadata.msgpack to manifest.msgpack (#1043)

Browse source 
We store the `Manifest` at this path, so this name feels more
appropriate.
This commit is contained in:
Charlie Marsh 2024-01-22 15:00:41 -05:00 • committed by GitHub
parent 89eb8547ce
commit c8941d4799
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/puffin-distribution/src/source/mod.rs
View file

@ -47,8 +47,8 @@ pub struct SourceDistCachedBuilder<'a, T: BuildContext> {
tags: &'a Tags, tags: &'a Tags,
} }
/// The name of the file that contains the cached metadata, encoded via `MsgPack`. /// The name of the file that contains the cached manifest, encoded via `MsgPack`.
const METADATA: &str = "metadata.msgpack"; const MANIFEST: &str = "manifest.msgpack";
impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> { impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
/// Initialize a [`SourceDistCachedBuilder`] from a [`BuildContext`]. /// Initialize a [`SourceDistCachedBuilder`] from a [`BuildContext`].
@ -243,7 +243,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
cache_shard: &CacheShard, cache_shard: &CacheShard,
subdirectory: Option<&'data Path>, subdirectory: Option<&'data Path>,
) -> Result<BuiltWheelMetadata, SourceDistError> { ) -> Result<BuiltWheelMetadata, SourceDistError> {
let cache_entry = cache_shard.entry(METADATA); let cache_entry = cache_shard.entry(MANIFEST);
let download = |response| { let download = |response| {
async { async {
@ -347,7 +347,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
cache_shard: &CacheShard, cache_shard: &CacheShard,
subdirectory: Option<&'data Path>, subdirectory: Option<&'data Path>,
) -> Result<Metadata21, SourceDistError> { ) -> Result<Metadata21, SourceDistError> {
let cache_entry = cache_shard.entry(METADATA); let cache_entry = cache_shard.entry(MANIFEST);
let download = |response| { let download = |response| {
async { async {
@ -459,7 +459,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
CacheBucket::BuiltWheels, CacheBucket::BuiltWheels,
WheelCache::Path(&path_source_dist.url) WheelCache::Path(&path_source_dist.url)
.remote_wheel_dir(path_source_dist.name().as_ref()), .remote_wheel_dir(path_source_dist.name().as_ref()),
METADATA, MANIFEST,
); );
// Determine the last-modified time of the source distribution. // Determine the last-modified time of the source distribution.
@ -468,7 +468,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
}; };
// Read the existing metadata from the cache. // Read the existing metadata from the cache.
let mut manifest = Self::read_cached_metadata(&cache_entry, modified) let mut manifest = Self::read_cached_manifest(&cache_entry, modified)
.await? .await?
.unwrap_or_default(); .unwrap_or_default();
@ -533,7 +533,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
CacheBucket::BuiltWheels, CacheBucket::BuiltWheels,
WheelCache::Path(&path_source_dist.url) WheelCache::Path(&path_source_dist.url)
.remote_wheel_dir(path_source_dist.name().as_ref()), .remote_wheel_dir(path_source_dist.name().as_ref()),
METADATA, MANIFEST,
); );
// Determine the last-modified time of the source distribution. // Determine the last-modified time of the source distribution.
@ -564,7 +564,7 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
}; };
// Read the existing metadata from the cache. // Read the existing metadata from the cache.
let mut manifest = Self::read_cached_metadata(&cache_entry, modified) let mut manifest = Self::read_cached_manifest(&cache_entry, modified)
.await? .await?
.unwrap_or_default(); .unwrap_or_default();
@ -641,11 +641,11 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
CacheBucket::BuiltWheels, CacheBucket::BuiltWheels,
WheelCache::Git(&git_source_dist.url, &git_sha.to_short_string()) WheelCache::Git(&git_source_dist.url, &git_sha.to_short_string())
.remote_wheel_dir(git_source_dist.name().as_ref()), .remote_wheel_dir(git_source_dist.name().as_ref()),
METADATA, MANIFEST,
); );
// Read the existing metadata from the cache. // Read the existing metadata from the cache.
let mut manifest = Self::read_metadata(&cache_entry).await?.unwrap_or_default(); let mut manifest = Self::read_manifest(&cache_entry).await?.unwrap_or_default();
// If the cache contains a compatible wheel, return it. // If the cache contains a compatible wheel, return it.
if let Some(built_wheel) = if let Some(built_wheel) =
@ -711,11 +711,11 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
CacheBucket::BuiltWheels, CacheBucket::BuiltWheels,
WheelCache::Git(&git_source_dist.url, &git_sha.to_short_string()) WheelCache::Git(&git_source_dist.url, &git_sha.to_short_string())
.remote_wheel_dir(git_source_dist.name().as_ref()), .remote_wheel_dir(git_source_dist.name().as_ref()),
METADATA, MANIFEST,
); );
// Read the existing metadata from the cache. // Read the existing metadata from the cache.
let mut manifest = Self::read_metadata(&cache_entry).await?.unwrap_or_default(); let mut manifest = Self::read_manifest(&cache_entry).await?.unwrap_or_default();
// If the cache contains compatible metadata, return it. // If the cache contains compatible metadata, return it.
if let Some(metadata) = manifest.find_metadata() { if let Some(metadata) = manifest.find_metadata() {
@ -1010,8 +1010,8 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
Ok((dist, disk_filename, filename, metadata)) Ok((dist, disk_filename, filename, metadata))
} }
/// Read an existing cache entry, if it exists and is up-to-date. /// Read an existing cached [`Manifest`], if it exists and is up-to-date.
async fn read_cached_metadata( async fn read_cached_manifest(
cache_entry: &CacheEntry, cache_entry: &CacheEntry,
modified: std::time::SystemTime, modified: std::time::SystemTime,
) -> Result<Option<Manifest>, SourceDistError> { ) -> Result<Option<Manifest>, SourceDistError> {
@ -1036,8 +1036,8 @@ impl<'a, T: BuildContext> SourceDistCachedBuilder<'a, T> {
} }
} }
/// Read an existing cache entry, if it exists. /// Read an existing cached [`Manifest`], if it exists.
async fn read_metadata(cache_entry: &CacheEntry) -> Result<Option<Manifest>, SourceDistError> { async fn read_manifest(cache_entry: &CacheEntry) -> Result<Option<Manifest>, SourceDistError> {
match fs::read(&cache_entry.path()).await { match fs::read(&cache_entry.path()).await {
Ok(cached) => Ok(Some(rmp_serde::from_slice::<Manifest>(&cached)?)), Ok(cached) => Ok(Some(rmp_serde::from_slice::<Manifest>(&cached)?)),
Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None), Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None),