Fix multiple input gallery enrollment

Charles Otto
1 parent 2fc318d4
Showing 1 changed file with 15 additions and 11 deletions
openbr/core/core.cpp
@@ -169,9 +169,6 @@ struct AlgorithmCore
  
     void enroll(File input, File gallery = File())
     {
-        qDebug("Enrolling %s%s", qPrintable(input.flat()),
-               gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
-
         bool noOutput = false;
         if (gallery.name.isEmpty()) {
             if (input.name.isEmpty()) return;
@@ -187,9 +184,6 @@ struct AlgorithmCore
             fileExclusion = true;
         }
  
-        Gallery *temp = Gallery::make(input);
-        qint64 total = temp->totalSize();
-
         Transform *enroll = simplifiedTransform.data();
  
         if (multiProcess)
@@ -208,13 +202,23 @@ struct AlgorithmCore
         stages.append(progressCounter.data());
  
         QScopedPointer<Transform> pipeline(pipeTransforms(stages));
-
         QScopedPointer<Transform> stream(wrapTransform(pipeline.data(), "Stream(readMode=StreamGallery, endPoint="+outputDesc+")"));
  
-        TemplateList data, output;
-        data.append(input);
-        progressCounter->setPropertyRecursive("totalProgress", QString::number(total));
-        stream->projectUpdate(data, output);
+        foreach (const br::File &file, input.split()) {
+            qDebug("Enrolling %s%s", qPrintable(file.name),
+                    gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
+
+            Gallery *temp = Gallery::make(file);
+            qint64 total = temp->totalSize();
+            delete temp;
+
+            progressCounter->setPropertyRecursive("totalProgress", QString::number(total));
+
+            TemplateList data, output;
+            data.append(file);
+
+            stream->projectUpdate(data, output);
+        }
  
         if (multiProcess)
             delete enroll;