mcy
/
nrgrip
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

main: a few style improvements

This commit is contained in:
Matteo Cypriani 2016-12-08 17:06:36 -05:00
parent 2b8f4a98d3
commit 76b895e4c1
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.rs
View File

@ -28,6 +28,9 @@ extern crate getopts;
use getopts::Options; use getopts::Options;
extern crate nrgrip; extern crate nrgrip;
use nrgrip::metadata;
use nrgrip::cue_sheet;
use nrgrip::raw_audio;
fn main() { fn main() {
@ -48,7 +51,7 @@ fn main() {
let options = match opts.parse(&args[1..]) { let options = match opts.parse(&args[1..]) {
Ok(m) => m, Ok(m) => m,
Err(err) => panic!(err.to_string()), Err(err) => panic!(err),
}; };
if options.opt_present("help") { if options.opt_present("help") {
@ -72,22 +75,22 @@ fn main() {
options.opt_present("info") || !(action_cue || action_raw); options.opt_present("info") || !(action_cue || action_raw);
// Open the image file // Open the image file
let fd = File::open(&img_path); let mut fd = match File::open(&img_path) {
if fd.is_err() { Ok(fd) => fd,
println!("Can't open image file \"{}\": {}", Err(err) => {
img_path, fd.unwrap_err().to_string()); println!("Can't open image file \"{}\": {}", img_path, err);
process::exit(1); process::exit(1);
} },
let mut fd = fd.unwrap(); };
// Read the image's metadata // Read the image's metadata
let metadata = nrgrip::metadata::read_nrg_metadata(&mut fd); let metadata = match metadata::read_nrg_metadata(&mut fd) {
if metadata.is_err() { Ok(metadata) => metadata,
println!("Error reading \"{}\": {}", Err(err) => {
img_path, metadata.unwrap_err().to_string()); println!("Error reading \"{}\": {}", img_path, err);
process::exit(1); process::exit(1);
} },
let metadata = metadata.unwrap(); };
// Display metadata if requested // Display metadata if requested
if action_info { if action_info {
@ -97,9 +100,8 @@ fn main() {
// Read and write the cue sheet // Read and write the cue sheet
if action_cue { if action_cue {
println!("\nExtracting cue sheet..."); println!("\nExtracting cue sheet...");
if let Err(err) = nrgrip::cue_sheet::write_cue_sheet(&img_path, if let Err(err) = cue_sheet::write_cue_sheet(&img_path, &metadata) {
&metadata) { println!("Error writing cue sheet: {}", err);
println!("Error writing cue sheet: {}", err.to_string());
process::exit(1); process::exit(1);
} }
println!("OK!"); println!("OK!");
@ -108,9 +110,9 @@ fn main() {
// Extract raw audio data // Extract raw audio data
if action_raw { if action_raw {
println!("\nExtracting raw audio data..."); println!("\nExtracting raw audio data...");
if let Err(err) = nrgrip::raw_audio::extract_nrg_raw_audio( if let Err(err) = raw_audio::extract_nrg_raw_audio(&mut fd, &img_path,
&mut fd, &img_path, &metadata) { &metadata) {
println!("Error extracting raw audio data: {}", err.to_string()); println!("Error extracting raw audio data: {}", err);
} }
println!("OK!"); println!("OK!");
} }