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.

Sign up for GitHub

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

Jump to bottom

Fix config parsing/setup #187

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Fix config parsing/setup #187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions src/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ impl std::str::FromStr for RegistryProtocol {
#[derive(Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Registry {
pub index: Url,
#[serde(skip)]
config: Option<IndexConfig>,
#[serde(default)]
#[serde(skip)]
pub protocol: RegistryProtocol,
#[serde(skip)]
dir_name: String,
}

Expand Down Expand Up @@ -106,7 +108,7 @@ impl Registry {
&krate.version,
),
None => {
format!("{}/{}/{}/download", self.index, krate.name, krate.version)
format!("{}{}/{}/download", self.index, krate.name, krate.version)
}
}
}
Expand Down Expand Up @@ -485,6 +487,21 @@ pub fn read_cargo_config(
}
}

if registry.dir_name.is_empty() {
let tame_index::utils::UrlDir { dir_name, .. } =
tame_index::utils::url_to_local_dir(registry.index.as_str()).unwrap();

registry.dir_name = dir_name;
}

if let Some(sparse_url) = registry.index.as_str().strip_prefix("sparse+") {
registry.protocol = RegistryProtocol::Sparse;

if registry.config.is_none() {
registry.index = Url::parse(sparse_url).unwrap();
}
}

registry
})
.collect())
Expand Down Expand Up @@ -526,7 +543,10 @@ pub fn read_lock_files(
continue;
};

let krate = if let Some(reg_src) = source.strip_prefix("registry+") {
let krate = if let Some(reg_src) = source
.strip_prefix("registry+")
.or_else(|| source.strip_prefix("sparse+"))
{
// This will most likely be an extremely short list, so we just do a
// linear search
let Some((ind, registry)) = registries
Expand Down