Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor license copy to remove unwrap() #476

Merged
merged 2 commits into from
Jan 2, 2019
Merged

Refactor license copy to remove unwrap() #476

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcdbaab
Refactor: returns proper error instead of unwrapping during license copy
mstallmo Dec 28, 2018
c99b934
Refactor: returns error instead of unwrapping path join
mstallmo Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/license.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,27 @@ use PBAR;

fn glob_license_files(path: &Path) -> Result<Vec<String>, failure::Error> {
let mut license_files: Vec<String> = Vec::new();
for entry in glob(path.join("LICENSE*").to_str().unwrap())? {
let path_string = match path.join("LICENSE*").to_str() {
Some(path_string) => path_string.to_owned(),
None => {
return Err(format_err!(
"Could not convert joined license path to String"
));
}
};

for entry in glob(&path_string)? {
match entry {
Ok(globed_path) => {
license_files.push(String::from(
globed_path.file_name().unwrap().to_str().unwrap(),
));
let file_name = match globed_path.file_name() {
Some(file_name) => file_name,
None => return Err(format_err!("Could not get file name from path")),
};
let file_name_string = match file_name.to_str() {
Some(file_name_string) => file_name_string.to_owned(),
None => return Err(format_err!("Could not convert filename to String")),
};
license_files.push(file_name_string);
}
Err(e) => println!("{:?}", e),
}
Expand Down Expand Up @@ -50,14 +65,14 @@ pub fn copy_from_crate(

match license_files {
Ok(files) => {
if files.len() == 0 {
if files.is_empty() {
PBAR.info("License key is set in Cargo.toml but no LICENSE file(s) were found; Please add the LICENSE file(s) to your project directory");
return Ok(());
}
for license_file in files {
let crate_license_path = path.join(&license_file);
let new_license_path = out_dir.join(&license_file);
if let Err(_) = fs::copy(&crate_license_path, &new_license_path) {
if fs::copy(&crate_license_path, &new_license_path).is_err() {
PBAR.info("origin crate has no LICENSE");
}
}
Expand Down