pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2024-12-12 11:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: separate IO errors more for pesde source download

Browse source
This commit is contained in:
daimond113 2024-11-01 19:50:11 +01:00
parent 00ea56745e
commit c9dc788056
No known key found for this signature in database
GPG key ID: 3A8ECE51328B513C
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/source/pesde/mod.rs
View file

@ -288,9 +288,11 @@ impl PackageSource for PesdePackageSource {
let mut entries = BTreeMap::new(); let mut entries = BTreeMap::new();
for entry in archive.entries()? { for entry in archive.entries().map_err(errors::DownloadError::Unpack)? {
let mut entry = entry?; let mut entry = entry.map_err(errors::DownloadError::Unpack)?;
let path = RelativePathBuf::from_path(entry.path()?).unwrap(); let path =
RelativePathBuf::from_path(entry.path().map_err(errors::DownloadError::Unpack)?)
.unwrap();
if entry.header().entry_type().is_dir() { if entry.header().entry_type().is_dir() {
if path if path
@ -310,14 +312,15 @@ impl PackageSource for PesdePackageSource {
continue; continue;
} }
let hash = store_reader_in_cas(project.cas_dir(), &mut entry)?; let hash = store_reader_in_cas(project.cas_dir(), &mut entry)
.map_err(errors::DownloadError::Store)?;
entries.insert(path, FSEntry::File(hash)); entries.insert(path, FSEntry::File(hash));
} }
let fs = PackageFS::CAS(entries); let fs = PackageFS::CAS(entries);
if let Some(parent) = index_file.parent() { if let Some(parent) = index_file.parent() {
std::fs::create_dir_all(parent)?; std::fs::create_dir_all(parent).map_err(errors::DownloadError::WriteIndex)?;
} }
std::fs::write(&index_file, toml::to_string(&fs)?) std::fs::write(&index_file, toml::to_string(&fs)?)
@ -551,7 +554,11 @@ pub mod errors {
/// Error unpacking package /// Error unpacking package
#[error("error unpacking package")] #[error("error unpacking package")]
Unpack(#[from] std::io::Error), Unpack(#[source] std::io::Error),
/// Error storing file in CAS
#[error("error storing file in CAS")]
Store(#[source] std::io::Error),
/// Error writing index file /// Error writing index file
#[error("error writing index file")] #[error("error writing index file")]