MirrorSave
/
caesium-clt
mirror of https://github.com/Lymphatus/caesium-clt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unwraps

This commit is contained in:
Matteo Paonessa 2024-12-17 20:46:38 +01:00
parent 3e24bae549
commit 135232c7b3
3 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compressor.rs
View File

@ -105,7 +105,13 @@ pub fn perform_compression(
return compression_result;
};
let mut compression_parameters = build_compression_parameters(args, input_file, needs_resize);
let mut compression_parameters = match build_compression_parameters(args, input_file, needs_resize) {
Ok(p) => p,
Err(e) => {
compression_result.message = format!("Error building compression parameters: {}", e);
return compression_result;
}
};
let input_file_buffer = match read_file_to_vec(input_file) {
Ok(b) => b,
Err(_) => {
@ -193,7 +199,7 @@ pub fn perform_compression(
.collect()
}
fn build_compression_parameters(args: &CommandLineArgs, input_file: &Path, needs_resize: bool) -> CSParameters {
fn build_compression_parameters(args: &CommandLineArgs, input_file: &Path, needs_resize: bool) -> Result<CSParameters, Box<dyn Error>> {
let mut parameters = CSParameters::new();
let quality = args.compression.quality.unwrap_or(80) as u32;
@ -209,11 +215,10 @@ fn build_compression_parameters(args: &CommandLineArgs, input_file: &Path, needs
if needs_resize {
let mime_type = get_file_mime_type(input_file);
build_resize_parameters(args, &mut parameters, input_file, mime_type).unwrap();
//TODO
build_resize_parameters(args, &mut parameters, input_file, mime_type)?;
}
parameters
Ok(parameters)
}
fn compute_output_full_path(

2
src/main.rs
View File

@ -116,7 +116,7 @@ fn setup_progress_bar(len: usize, verbose: VerboseLevel) -> ProgressBar {
progress_bar.set_style(
ProgressStyle::default_bar()
.template("[{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos}/{len}\n{msg}")
.unwrap() //TODO: handle error
.unwrap_or_else(|_| ProgressStyle::default_bar())
.progress_chars("#>-"),
);
progress_bar.enable_steady_tick(Duration::new(1, 0));

70
src/scan_files.rs
View File

@ -1,14 +1,17 @@
use std::path::{absolute, Path, PathBuf};
use std::time::Duration;
use indicatif::{ProgressBar, ProgressDrawTarget, ProgressIterator};
use indicatif::ProgressStyle;
use indicatif::{ProgressBar, ProgressDrawTarget, ProgressIterator};
use walkdir::WalkDir;
fn is_filetype_supported(path: &Path) -> bool {
match get_file_mime_type(path) {
Some(mime_type) => {
matches!(mime_type.as_str(), "image/jpeg" | "image/png" | "image/webp" | "image/gif")
matches!(
mime_type.as_str(),
"image/jpeg" | "image/png" | "image/webp" | "image/gif"
)
}
None => false,
}
@ -44,42 +47,47 @@ pub fn scan_files(args: &[String], recursive: bool, quiet: bool) -> (PathBuf, Ve
for entry in walk_dir.into_iter().filter_map(|e| e.ok()) {
let path = entry.into_path();
if is_valid(&path) {
base_path = make_absolute_and_push(&path, base_path, &mut files);
base_path = match compute_base_path(&path, &base_path) {
Some(p) => p,
None => continue,
};
files.push(path);
}
}
} else if is_valid(&input) {
base_path = make_absolute_and_push(&input, base_path, &mut files);
base_path = match compute_base_path(&input, &base_path) {
Some(p) => p,
None => continue,
};
files.push(input);
}
}
(base_path, files)
}
fn make_absolute_and_push(path: &Path, mut base_path: PathBuf, files: &mut Vec<PathBuf>) -> PathBuf {
fn compute_base_path(path: &Path, base_path: &Path) -> Option<PathBuf> {
if let Ok(ap) = absolute(path) {
base_path = compute_base_folder(&base_path, &ap);
files.push(ap);
let bp = compute_base_folder(base_path, &ap)?;
return Some(bp);
}
base_path
None
}
fn compute_base_folder(base_folder: &Path, new_path: &Path) -> PathBuf {
fn compute_base_folder(base_folder: &Path, new_path: &Path) -> Option<PathBuf> {
if base_folder.as_os_str().is_empty() && new_path.parent().is_some() {
return new_path.parent().unwrap().to_path_buf();
return Some(new_path.parent()?.to_path_buf());
}
if base_folder.parent().is_none() {
return base_folder.to_path_buf();
return Some(base_folder.to_path_buf());
}
let mut folder = PathBuf::new();
let mut new_path_folder = new_path.to_path_buf();
if new_path.is_file() {
new_path_folder = new_path
.parent()
.unwrap_or(&*PathBuf::from("/"))
.to_path_buf();
new_path_folder = new_path.parent().unwrap_or(&*PathBuf::from("/")).to_path_buf();
}
for (i, component) in base_folder.iter().enumerate() {
if let Some(new_path_component) = new_path_folder.iter().nth(i) {
@ -94,10 +102,10 @@ fn compute_base_folder(base_folder: &Path, new_path: &Path) -> PathBuf {
}
if folder.parent().is_none() {
return PathBuf::from("/");
return Some(folder);
}
folder
Some(folder)
}
fn init_progress_bar(quiet: bool) -> ProgressBar {
@ -191,37 +199,37 @@ mod tests {
let base_folder = Path::new("/base/folder");
let new_path = Path::new("/base/folder/subfolder/file.jpg");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/base/folder"));
let base_folder = Path::new("/base/folder/subfolder/another/folder");
let new_path = Path::new("/base/folder/subfolder/file.jpg");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/base/folder/subfolder"));
let base_folder = Path::new("/base/folder/subfolder/another/folder");
let new_path = Path::new("/file.jpg");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
let base_folder = Path::new("/");
let new_path = Path::new("/base/folder/subfolder/file.jpg");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
let base_folder = Path::new("/");
let new_path = Path::new("/file.jpg");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
let base_folder = PathBuf::new();
let new_path = Path::new("/temp/file.jpg");
let result = compute_base_folder(&base_folder, new_path);
let result = compute_base_folder(&base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/temp"));
}
@ -230,31 +238,31 @@ mod tests {
let base_folder = Path::new("/base/folder");
let new_path = Path::new("/base/folder/subfolder");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/base/folder"));
let base_folder = Path::new("/base/folder/subfolder/another/folder");
let new_path = Path::new("/base/folder/subfolder");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/base/folder/subfolder"));
let base_folder = Path::new("/base/folder/subfolder/another/folder");
let new_path = Path::new("/");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
let base_folder = Path::new("/");
let new_path = Path::new("/base/folder/subfolder");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
let base_folder = Path::new("/");
let new_path = Path::new("/");
let result = compute_base_folder(base_folder, new_path);
let result = compute_base_folder(base_folder, new_path).expect("Failed to compute base folder");
assert_eq!(result, Path::new("/"));
}
}