Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

match conda with .state.json -> .info.json #377

Merged
merged 2 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/rattler_repodata_gateway/src/fetch/cache/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde_with::serde_as;
use std::{fs::File, io::Read, path::Path, str::FromStr, time::SystemTime};
use url::Url;

/// Representation of the `.state.json` file alongside a `repodata.json` file.
/// Representation of the `.info.json` file alongside a `repodata.json` file.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RepoDataState {
/// The URL from where the repodata was downloaded. This is the URL of the `repodata.json`,
Expand Down
2 changes: 1 addition & 1 deletion crates/rattler_repodata_gateway/src/fetch/jlap/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
//! &current_repo_data
//! ).await.unwrap();
//!
//! // Now we can use the `updated_jlap_state` object to update our `.state.json` file
//! // Now we can use the `updated_jlap_state` object to update our `.info.json` file
//! }
//! ```
//!
Expand Down
4 changes: 2 additions & 2 deletions crates/rattler_repodata_gateway/src/fetch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ pub async fn fetch_repo_data(
.expect("file name is valid"),
);
let repo_data_json_path = cache_path.join(format!("{}.json", cache_key));
let cache_state_path = cache_path.join(format!("{}.state.json", cache_key));
let cache_state_path = cache_path.join(format!("{}.info.json", cache_key));

// Lock all files that have to do with that cache key
let lock_file_path = cache_path.join(format!("{}.lock", &cache_key));
Expand Down Expand Up @@ -867,7 +867,7 @@ fn validate_cached_state(
cache_key: &str,
) -> ValidatedCacheState {
let repo_data_json_path = cache_path.join(format!("{}.json", cache_key));
let cache_state_path = cache_path.join(format!("{}.state.json", cache_key));
let cache_state_path = cache_path.join(format!("{}.info.json", cache_key));

// Check if we have cached repodata.json file
let json_metadata = match std::fs::metadata(&repo_data_json_path) {
Expand Down