Skipped process_batch for now, added verbose output to main.cpp

Signed-off-by: Mikael Sundell <[email protected]>

Author: mikaelsundell

include/rawtoaces/image_converter.h

@@ -259,17 +259,6 @@ class ImageConverter
     ///    `true` if processed successfully.
     bool process_image( const std::string &input_filename );
 
-    /// Process a batch of input files or directories.
-    /// This will iterate over each batch and call process_image() on every file.
-    /// @param batches
-    ///     Vector of batches, each batch is a vector of filenames.
-    /// @param empty
-    ///     Output flag that becomes true if no files were processed.
-    /// @result
-    ///     true if all files were processed successfully, false otherwise.
-    bool process_batch(
-        const std::vector<std::vector<std::string>> &batches, bool &empty );
-
     /// Get the solved white balance multipliers of the currently processed
     /// image. The multipliers become available after calling either of the
     /// two `configure` methods.

src/rawtoaces/main.cpp

@@ -40,9 +40,46 @@ int main( int argc, const char *argv[] )
     std::vector<std::vector<std::string>> batches =
         rta::util::collect_image_files( files );
 
-    // Process batch
+    // Process raw files
     bool empty  = true;
-    bool result = converter.process_batch( batches, empty );
+    bool result = true;
+
+    int file_index  = 0;
+    int total_files = 0;
+
+    for ( auto const &batch: batches )
+        total_files += static_cast<int>( batch.size() );
+
+    for ( auto const &batch: batches )
+    {
+        for ( auto const &input_filename: batch )
+        {
+            ++file_index;
+            if ( converter.settings.verbosity > 0 )
+            {
+                std::cerr << "[" << file_index << "/" << total_files
+                          << "] Processing file: " << input_filename
+                          << std::endl;
+            }
+
+            empty  = false;
+            result = converter.process_image( input_filename );
+            if ( !result )
+            {
+
+                if ( converter.settings.verbosity > 0 )
+                {
+                    std::cerr << "Failed on file [" << file_index << "/"
+                              << total_files << "]: " << input_filename
+                              << std::endl;
+                }
+
+                break;
+            }
+        }
+        if ( !result )
+            break;
+    }
 
     if ( empty )
         arg_parser.print_help();

src/rawtoaces_util/image_converter.cpp

@@ -1915,51 +1915,6 @@ bool ImageConverter::process_image( const std::string &input_filename )
     return ( true );
 }
 
-bool ImageConverter::process_batch(
-    const std::vector<std::vector<std::string>> &batches, bool &empty )
-{
-    empty       = true;
-    bool result = true;
-
-    size_t total_files = 0;
-    for ( const auto &batch: batches )
-        total_files += batch.size();
-
-    size_t file_index = 0;
-
-    for ( auto const &batch: batches )
-    {
-        for ( auto const &input_filename: batch )
-        {
-            empty = false;
-            ++file_index;
-
-            if ( settings.verbosity > 0 )
-            {
-                std::cerr << "[" << file_index << "/" << total_files
-                          << "] Processing file: " << input_filename
-                          << std::endl;
-            }
-
-            result = process_image( input_filename );
-            if ( !result )
-            {
-                if ( settings.verbosity > 0 )
-                {
-                    std::cerr << "Failed on file [" << file_index << "/"
-                              << total_files << "]: " << input_filename
-                              << std::endl;
-                }
-                break;
-            }
-        }
-        if ( !result )
-            break;
-    }
-
-    return result;
-}
-
 const std::vector<double> &ImageConverter::get_WB_multipliers()
 {
     return _WB_multipliers;