actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-02 09:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #222 from NobodyXu/refactor

Browse source 
Refactor: Make appending to metafiles easier and fix their err handling
This commit is contained in:
Jiahao XU 2022-07-22 11:29:12 +10:00 • committed by GitHub
commit adbc587f3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/metafiles/v1.rs
View file

@ -1,6 +1,6 @@
use std::{
collections::{BTreeMap, BTreeSet},
fs,
fs, io,
path::{Path, PathBuf},
str::FromStr,
};
@ -14,7 +14,7 @@ use crate::cargo_home;
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct CratesToml {
v1: BTreeMap<CrateVersionSource, BTreeSet<String>>,
v1: BTreeMap<String, BTreeSet<String>>,
}
impl CratesToml {
@ -31,8 +31,8 @@ impl CratesToml {
Self::from_str(&file)
}
pub fn insert(&mut self, cvs: CrateVersionSource, bins: BTreeSet<String>) {
self.v1.insert(cvs, bins);
pub fn insert(&mut self, cvs: &CrateVersionSource, bins: BTreeSet<String>) {
self.v1.insert(cvs.to_string(), bins);
}
pub fn write(&self) -> Result<(), CratesTomlParseError> {
@ -43,6 +43,31 @@ impl CratesToml {
fs::write(path, &toml::to_vec(&self)?)?;
Ok(())
}
pub fn append_to_path(
path: impl AsRef<Path>,
cvs: &CrateVersionSource,
bins: BTreeSet<String>,
) -> Result<(), CratesTomlParseError> {
let mut c1 = match Self::load_from_path(path.as_ref()) {
Ok(c1) => c1,
Err(CratesTomlParseError::Io(io_err)) if io_err.kind() == io::ErrorKind::NotFound => {
Self::default()
}
Err(err) => return Err(err),
};
c1.insert(cvs, bins);
c1.write_to_path(path.as_ref())?;
Ok(())
}
pub fn append(
cvs: &CrateVersionSource,
bins: BTreeSet<String>,
) -> Result<(), CratesTomlParseError> {
Self::append_to_path(Self::default_path()?, cvs, bins)
}
}
impl FromStr for CratesToml {
@ -55,7 +80,7 @@ impl FromStr for CratesToml {
#[derive(Debug, Diagnostic, Error)]
pub enum CratesTomlParseError {
#[error(transparent)]
Io(#[from] std::io::Error),
Io(#[from] io::Error),
#[error(transparent)]
TomlParse(#[from] toml::de::Error),