Merge pull request #44 from instaclustr/dont_return_option_for_file

reader: Dont return option for file
NOTE: I messed up the merge, I will create a PR to fix the merge.

brro-compressor/src/main.rs

@@ -46,17 +46,15 @@ fn process_directory(arguments: &Args) {
 }
 
 /// Processes a single file.
-fn process_single_file(arguments: &Args) {
-    if let Some((vec, tag)) = reader::read_file(&arguments.input).expect("Failed to read file") {
-        let compressed_data = compress_data(&vec, &tag, arguments);
+fn process_single_file(path: &Path, arguments: &Args) {
+    let (vec, tag) = reader::read_file(path).expect("Failed to read file");
+    let compressed_data = compress_data(&vec, &tag, arguments);
 
-        if let Some(filename_osstr) = arguments.input.file_name() {
-            if let Some(filename_str) = filename_osstr.to_str() {
-                let new_filename_string =
-                    writer::replace_extension(&filename_str.to_string(), "bin");
-                let new_path = arguments.input.parent().unwrap().join(new_filename_string);
-                write_compressed_data_to_path(&compressed_data, &new_path);
-            }
+    if let Some(filename_osstr) = path.file_name() {
+        if let Some(filename_str) = filename_osstr.to_str() {
+            let new_filename_string = writer::replace_extension(&filename_str.to_string(), "bin");
+            let new_path = path.parent().unwrap().join(new_filename_string);
+            write_compressed_data_to_path(&compressed_data, &new_path);
         }
     }
 }

brro-compressor/src/utils/reader.rs

@@ -30,10 +30,8 @@ fn process_wav_file(file_path: &Path) -> io::Result<(Vec<f64>, MetricTag)> {
 }
 
 // Function to process a RAW file
-fn process_raw_file(file_path: &Path) -> io::Result<()> {
-    // Handle RAW file processing here (for example, decoding or encoding)
-    println!("Processing RAW file: {:?}", file_path);
-    Ok(())
+fn process_raw_file(file_path: &Path) -> io::Result<(Vec<f64>, MetricTag)> {
+    todo!("Handle RAW file processing here (for example, decoding or encoding): {file_path:?}");
 }
 
 pub struct Files {
@@ -82,21 +80,18 @@ pub fn stream_reader(directory_path: &Path) -> io::Result<Files> {
         }
 
         // Check if the file is a WAV file
-        let res = read_file(&file_path)?;
-        if let Some((vec, tag)) = res { contents.push((vec, tag)) }
+        contents.push(read_file(&file_path)?);
     }
     Ok(Files {contents, names})
 }
 
-pub fn read_file(file_path: &Path) -> Result<Option<(Vec<f64>, MetricTag)>, Error> {
+pub fn read_file(file_path: &Path) -> Result<(Vec<f64>, MetricTag), Error> {
     if is_wav_file(file_path)? {
         // If it's a WAV file, process it using the process_wav_file function
-        let wav_result = process_wav_file(file_path)?;
-        Ok(Option::from(wav_result))
+        process_wav_file(file_path)
     } else {
         // If it's not a WAV file, process it as a RAW file using the process_raw_file function
-        process_raw_file(file_path)?;
-        Ok(None)
+        process_raw_file(file_path)
     }
 
 }