-
Notifications
You must be signed in to change notification settings - Fork 0
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 #34 from tamada/release/v0.6.0
Release/v0.6.0
- Loading branch information
Showing
17 changed files
with
469 additions
and
152 deletions.
There are no files selected for viewing
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
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,133 @@ | ||
| use std::fs::File; | ||
| use std::path::PathBuf; | ||
|
|
||
| use cab::CabinetBuilder; | ||
|
|
||
| use crate::archiver::{Archiver, ArchiverOpts}; | ||
| use crate::cli::{ToteError, Result}; | ||
| use crate::format::Format; | ||
|
|
||
| pub(super) struct CabArchiver { | ||
| } | ||
|
|
||
| impl Archiver for CabArchiver { | ||
| fn perform(&self, opts: &ArchiverOpts) -> Result<()> { | ||
| match opts.destination() { | ||
| Err(e) => Err(e), | ||
| Ok(file) => { | ||
| write_impl(file, opts.targets(), opts.recursive, opts.base_dir.clone()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn format(&self) -> Format { | ||
| Format::Cab | ||
| } | ||
| } | ||
|
|
||
| fn write_impl(file: File, targets: Vec<PathBuf>, recursive: bool, base_dir: PathBuf) -> Result<()> { | ||
| let mut builder = CabinetBuilder::new(); | ||
| let folder = builder.add_folder(cab::CompressionType::MsZip); | ||
| let list = correct_targets(targets, recursive, base_dir); | ||
| for (_from, dest_file) in list.clone() { | ||
| folder.add_file(dest_file); | ||
| } | ||
| let mut writer = match builder.build(file) { | ||
| Ok(w) => w, | ||
| Err(e) => return Err(ToteError::Archiver(e.to_string())), | ||
| }; | ||
| let mut iter = list.iter(); | ||
| while let Some(mut w) = writer.next_file().unwrap() { | ||
| let (from, _) = iter.next().unwrap(); | ||
| if let Ok(mut reader) = File::open(from) { | ||
| std::io::copy(&mut reader, &mut w).unwrap(); | ||
| } | ||
| } | ||
| match writer.finish() { | ||
| Ok(_) => Ok(()), | ||
| Err(e) => Err(ToteError::Archiver(e.to_string())), | ||
| } | ||
| } | ||
|
|
||
| fn correct_targets(targets: Vec<PathBuf>, recursive: bool, base_dir: PathBuf) -> Vec<(PathBuf, String)> { | ||
| let mut result = vec![]; | ||
| for target in targets { | ||
| let path = target.as_path(); | ||
| if path.is_dir() && recursive { | ||
| process_dir(&mut result, path.to_path_buf(), &base_dir); | ||
| } else if path.is_file(){ | ||
| process_file(&mut result, path.to_path_buf(), &base_dir); | ||
| } | ||
| } | ||
| result | ||
| } | ||
|
|
||
| fn process_dir(result: &mut Vec<(PathBuf, String)>, path: PathBuf, base_dir: &PathBuf) { | ||
| for entry in path.read_dir().unwrap() { | ||
| if let Ok(e) = entry { | ||
| let p = e.path(); | ||
| if p.is_dir() { | ||
| process_dir(result, e.path(), &base_dir) | ||
| } else if p.is_file() { | ||
| process_file(result, e.path(), &base_dir) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn process_file(result: &mut Vec<(PathBuf, String)>, target: PathBuf, base_dir: &PathBuf) { | ||
| let target_path = match target.strip_prefix(base_dir) { | ||
| Ok(p) => p.to_path_buf(), | ||
| Err(_) => target.clone(), | ||
| }; | ||
| let name = target_path.to_str().unwrap(); | ||
| result.push((target, name.to_string())); | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| use std::path::PathBuf; | ||
| use crate::verboser::create_verboser; | ||
|
|
||
| fn run_test<F>(f: F) | ||
| where | ||
| F: FnOnce(), | ||
| { | ||
| // setup(); // 予めやりたい処理 | ||
| let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(f)); | ||
| teardown(); // 後片付け処理 | ||
|
|
||
| if let Err(err) = result { | ||
| std::panic::resume_unwind(err); | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_format() { | ||
| let archiver = CabArchiver{}; | ||
| assert_eq!(archiver.format(), Format::Cab); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_archive() { | ||
| run_test(|| { | ||
| let archiver = CabArchiver{}; | ||
| let opts = ArchiverOpts { | ||
| dest: PathBuf::from("results/test.cab"), | ||
| targets: vec![PathBuf::from("src"), PathBuf::from("Cargo.toml")], | ||
| base_dir: PathBuf::from("."), | ||
| overwrite: false, | ||
| recursive: false, | ||
| v: create_verboser(false), | ||
| }; | ||
| let r = archiver.perform(&opts); | ||
| assert!(r.is_ok()); | ||
| }); | ||
| } | ||
|
|
||
| fn teardown() { | ||
| let _ = std::fs::remove_file("results/test.cab"); | ||
| } | ||
| } |
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
Oops, something went wrong.