Compare commits

..

No commits in common. "acbdf2d99284b69a48601f3aeb0a56f295872a4c" and "723d697e9085a575c1f6d59baf1e79819452d747" have entirely different histories.

3 changed files with 24 additions and 30 deletions

View File

@ -1,12 +1,13 @@
pub mod tar;
mod package;
mod plist;
pub mod tar;
mod version;
pub use {
deku,
package::{Arch, Dependency, Group, Package, Specs, User},
package::{Arch, Dependency, Package, Specs},
plist::*,
ron, sha2,
ron,
sha2,
version::*,
};

View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use std::{error::Error, fmt, str::FromStr};
use std::{fmt, str::FromStr, error::Error};
#[cfg(target_arch = "arm")]
pub const HOST_ARCH: Arch = Arch::armv7l;
@ -33,10 +33,7 @@ impl Default for Arch {
impl fmt::Display for Arch {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(
f,
"{}",
match self {
write!(f, "{}", match self {
Self::armv7l => "armv7l",
Self::aarch64 => "aarch64",
Self::i486 => "i486",
@ -45,8 +42,7 @@ impl fmt::Display for Arch {
Self::riscv64 => "riscv64",
Self::x86_64 => "x86_64",
Self::any => "any",
}
)
})
}
}
@ -73,7 +69,7 @@ impl FromStr for Arch {
"arm64" | "aarch64" | "armv8" => Ok(Self::aarch64),
"riscv" | "riscv64" => Ok(Self::riscv64),
"any" => Ok(Self::any),
_ => Err(ParseArchError),
_ => Err(ParseArchError)
}
}
}

View File

@ -3,7 +3,6 @@ mod dependency;
mod specs;
use {
crate::tar::{Node, Owner},
crate::{Plist, Version},
ron::ser::{to_string_pretty, PrettyConfig},
serde::{Deserialize, Serialize},
@ -14,6 +13,7 @@ use {
io::{BufWriter, Write},
path::Path,
},
crate::tar::{Node, Owner},
};
pub use {arch::Arch, dependency::Dependency, specs::Specs};
@ -88,7 +88,10 @@ impl Package {
to_string_pretty(self, cfg)
}
pub fn save_ron_and_create_tar_node(&self, outdir: &Path) -> Result<Node, Box<dyn Error>> {
pub fn save_ron_and_create_tar_node(
&self,
outdir: &Path,
) -> Result<Node, Box<dyn Error>> {
if !outdir.exists() {
fs::create_dir_all(outdir)?;
}
@ -110,18 +113,12 @@ impl Package {
/// Returns the formatted full package name including version and release strings
pub fn fullname(&self) -> String {
format!(
"{}-{}_{}_{}",
self.name, self.version, self.release, self.arch
)
format!("{}-{}_{}_{}", self.name, self.version, self.release, self.arch)
}
/// Returns the name of the package archive
pub fn archive_name(&self) -> String {
format!(
"{}-{}_{}_{}.tar.zstd",
self.name, self.version, self.release, self.arch
)
format!("{}-{}_{}_{}.tar.zstd", self.name, self.version, self.release, self.arch)
}
/// Tests whether this package is an update for another