-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #719 from epage/tame
fix: Always use sparse index
- Loading branch information
Showing
11 changed files
with
738 additions
and
62 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| use tame_index::krate::IndexKrate; | ||
|
|
||
| pub struct CratesIoIndex { | ||
| index: RemoteIndex, | ||
| cache: std::collections::HashMap<String, Option<IndexKrate>>, | ||
| } | ||
|
|
||
| impl CratesIoIndex { | ||
| #[inline] | ||
| pub fn open() -> Result<Self, crate::error::CliError> { | ||
| Ok(Self { | ||
| index: RemoteIndex::open()?, | ||
| cache: Default::default(), | ||
| }) | ||
| } | ||
|
|
||
| /// Determines if the specified crate exists in the crates.io index | ||
| #[inline] | ||
| pub fn has_krate(&mut self, name: &str) -> Result<bool, crate::error::CliError> { | ||
| Ok(self.krate(name)?.map(|_| true).unwrap_or(false)) | ||
| } | ||
|
|
||
| /// Determines if the specified crate version exists in the crates.io index | ||
| #[inline] | ||
| pub fn has_krate_version( | ||
| &mut self, | ||
| name: &str, | ||
| version: &str, | ||
| ) -> Result<Option<bool>, crate::error::CliError> { | ||
| let krate = self.krate(name)?; | ||
| Ok(krate.map(|ik| ik.versions.iter().any(|iv| iv.version == version))) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn update_krate(&mut self, name: &str) { | ||
| self.cache.remove(name); | ||
| } | ||
|
|
||
| pub(crate) fn krate( | ||
| &mut self, | ||
| name: &str, | ||
| ) -> Result<Option<IndexKrate>, crate::error::CliError> { | ||
| if let Some(entry) = self.cache.get(name) { | ||
| log::trace!("Reusing index for {name}"); | ||
| return Ok(entry.clone()); | ||
| } | ||
|
|
||
| log::trace!("Downloading index for {name}"); | ||
| let entry = self.index.krate(name)?; | ||
| self.cache.insert(name.to_owned(), entry.clone()); | ||
| Ok(entry) | ||
| } | ||
| } | ||
|
|
||
| pub struct RemoteIndex { | ||
| index: tame_index::SparseIndex, | ||
| client: reqwest::blocking::Client, | ||
| etags: Vec<(String, String)>, | ||
| } | ||
|
|
||
| impl RemoteIndex { | ||
| #[inline] | ||
| pub fn open() -> Result<Self, crate::error::CliError> { | ||
| let index = tame_index::SparseIndex::new(tame_index::IndexLocation::new( | ||
| tame_index::IndexUrl::CratesIoSparse, | ||
| ))?; | ||
| let client = reqwest::blocking::ClientBuilder::new() | ||
| .http2_prior_knowledge() | ||
| .build()?; | ||
|
|
||
| Ok(Self { | ||
| index, | ||
| client, | ||
| etags: Vec::new(), | ||
| }) | ||
| } | ||
|
|
||
| pub(crate) fn krate( | ||
| &mut self, | ||
| name: &str, | ||
| ) -> Result<Option<IndexKrate>, crate::error::CliError> { | ||
| let etag = self | ||
| .etags | ||
| .iter() | ||
| .find_map(|(krate, etag)| (krate == name).then_some(etag.as_str())) | ||
| .unwrap_or(""); | ||
|
|
||
| let krate_name = name.try_into()?; | ||
| let req = self.index.make_remote_request(krate_name, Some(etag))?; | ||
| let res = self.client.execute(req.try_into()?)?; | ||
|
|
||
| // Grab the etag if it exists for future requests | ||
| if let Some(etag) = res.headers().get(reqwest::header::ETAG) { | ||
| if let Ok(etag) = etag.to_str() { | ||
| if let Some(i) = self.etags.iter().position(|(krate, _)| krate == name) { | ||
| self.etags[i].1 = etag.to_owned(); | ||
| } else { | ||
| self.etags.push((name.to_owned(), etag.to_owned())); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let mut builder = tame_index::external::http::Response::builder() | ||
| .status(res.status()) | ||
| .version(res.version()); | ||
|
|
||
| builder | ||
| .headers_mut() | ||
| .unwrap() | ||
| .extend(res.headers().iter().map(|(k, v)| (k.clone(), v.clone()))); | ||
|
|
||
| let body = res.bytes()?; | ||
| let response = builder | ||
| .body(body.to_vec()) | ||
| .map_err(|e| tame_index::Error::from(tame_index::error::HttpError::from(e)))?; | ||
|
|
||
| self.index | ||
| .parse_remote_response(krate_name, response, false) | ||
| .map_err(Into::into) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| pub mod cargo; | ||
| pub mod cmd; | ||
| pub mod git; | ||
| pub mod index; | ||
| pub mod replace; | ||
| pub mod shell; | ||
| pub mod version; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters