single call to Separator.separate for all inputs (#233)

* single call to Separator.separate for all inputs

* fix unit tests

Author: Politrees

audio_separator/utils/cli.py

@@ -179,30 +179,12 @@ def main():
         logger.info(f"Model {args.model_filename} downloaded successfully.")
         sys.exit(0)
 
-    if not hasattr(args, "audio_files"):
-        parser.print_help()
-        sys.exit(1)
-
-    # Path processing: if a directory is specified, collect all audio files from it
-    audio_files = []
-    for path in args.audio_files:
-        if os.path.isdir(path):
-            # If the path is a directory, recursively search for all audio files
-            for root, dirs, files in os.walk(path):
-                for file in files:
-                    # Check the file extension to ensure it's an audio file
-                    if file.endswith((".wav", ".flac", ".mp3", ".ogg", ".opus", ".m4a", ".aiff", ".ac3")):  # Add other formats if needed
-                        audio_files.append(os.path.join(root, file))
-        else:
-            # If the path is a file, add it to the list
-            audio_files.append(path)
-
-    # If no audio files are found, log an error and exit the program
+    audio_files = list(getattr(args, "audio_files", []))
     if not audio_files:
-        logger.error("No valid audio files found in the specified path(s).")
+        parser.print_help()
         sys.exit(1)
 
-    logger.info(f"Separator version {package_version} beginning with input file(s): {', '.join(audio_files)}")
+    logger.info(f"Separator version {package_version} beginning with input path(s): {', '.join(audio_files)}")
 
     separator = Separator(
         log_formatter=log_formatter,
@@ -234,7 +216,12 @@ def main():
             "post_process_threshold": args.vr_post_process_threshold,
             "high_end_process": args.vr_high_end_process,
         },
-        demucs_params={"segment_size": args.demucs_segment_size, "shifts": args.demucs_shifts, "overlap": args.demucs_overlap, "segments_enabled": args.demucs_segments_enabled},
+        demucs_params={
+            "segment_size": args.demucs_segment_size,
+            "shifts": args.demucs_shifts,
+            "overlap": args.demucs_overlap,
+            "segments_enabled": args.demucs_segments_enabled,
+        },
         mdxc_params={
             "segment_size": args.mdxc_segment_size,
             "batch_size": args.mdxc_batch_size,
@@ -246,6 +233,5 @@ def main():
 
     separator.load_model(model_filename=args.model_filename)
 
-    for audio_file in audio_files:
-        output_files = separator.separate(audio_file, custom_output_names=args.custom_output_names)
-        logger.info(f"Separation complete! Output file(s): {' '.join(output_files)}")
+    output_files = separator.separate(audio_files, custom_output_names=args.custom_output_names)
+    logger.info(f"Separation complete! Output file(s): {' '.join(output_files)}")

tests/unit/test_cli.py

@@ -72,8 +72,9 @@ def test_cli_multiple_filenames():
         # Call the main function
         main()
 
-        # Check if separate was called twice (once for each input file)
-        assert mock_separate.call_count == 2
+        mock_separate.assert_called_once()
+        args, kwargs = mock_separate.call_args
+        assert args[0] == ["test1.mp3", "test2.mp3"]
 
         # Check if the logger captured information about both files
         log_messages = [call[0][0] for call in mock_logger.info.call_args_list]
@@ -258,7 +259,7 @@ def test_cli_custom_output_names_argument(common_expected_args):
 
             # Assertions
             mock_separator.assert_called_once_with(**common_expected_args)
-            mock_separator_instance.separate.assert_called_once_with("test_audio.mp3", custom_output_names=custom_names)
+            mock_separator_instance.separate.assert_called_once_with(["test_audio.mp3"], custom_output_names=custom_names)
 
 
 # Test using custom_output_names arguments
@@ -280,4 +281,4 @@ def test_cli_demucs_output_names_argument(common_expected_args):
 
             # Assertions
             mock_separator.assert_called_once_with(**common_expected_args)
-            mock_separator_instance.separate.assert_called_once_with("test_audio.mp3", custom_output_names=demucs_output_names)
+            mock_separator_instance.separate.assert_called_once_with(["test_audio.mp3"], custom_output_names=demucs_output_names)