Rename emptyRead FileList::fromGallery, default caching to off.

Charles Otto
1 parent 33ec0cdc
Showing 5 changed files with 11 additions and 14 deletions
openbr/core/core.cpp
openbr/openbr_plugin.h
openbr/plugins/gallery.cpp
openbr/plugins/misc.cpp
openbr/plugins/openbr_internal.h
@@ -350,8 +350,8 @@ struct AlgorithmCore
         FileList queryMetadata;
  
         // Emptyread reads a gallery, and discards any matrices present, keeping only the metadata.
-        emptyRead(targetGallery, targetMetadata);
-        emptyRead(queryGallery, queryMetadata);
+        targetMetadata = FileList::fromGallery(targetGallery, true);
+        queryMetadata  = FileList::fromGallery(queryGallery, true);
  
  
         // Is the target or query set larger? We will use the larger as the rows of our comparison matrix (and transpose the output if necessary)
@@ -369,6 +369,8 @@ struct BR_EXPORT FileList : public QList&lt;File&gt;
  
     QList<int> crossValidationPartitions() const; /*!< \brief Returns the cross-validation partition (default=0) for each file in the list. */
     int failures() const; /*!< \brief Returns the number of files with br::File::failed(). */
+
+    static FileList fromGallery(const File &gallery, bool cache = false); /*!< \brief Create a file list from a br::Gallery. */
 };
  
 /*!
@@ -393,16 +393,17 @@ class memGallery : public Gallery
  
 BR_REGISTER(Gallery, memGallery)
  
-void emptyRead(const File & file, FileList & fileData, bool cache)
+FileList FileList::fromGallery(const File & file, bool cache)
 {
     File targetMeta = file;
     targetMeta.name = targetMeta.path() + targetMeta.baseName() + "_meta" + targetMeta.hash() + ".mem";
  
+    FileList fileData;
+
     // Did we already read the data?
     if (MemoryGalleries::galleries.contains(targetMeta))
     {
-        fileData = MemoryGalleries::galleries[targetMeta].files();
-        return;
+        return MemoryGalleries::galleries[targetMeta].files();
     }
  
     TemplateList templates;
@@ -434,6 +435,7 @@ void emptyRead(const File &amp; file, FileList &amp; fileData, bool cache)
         memOutput->writeBlock(templates);
     }
     fileData = templates.files();
+    return fileData;
 }
  
 /*!
@@ -636,10 +636,8 @@ class OutputTransform : public TimeVaryingTransform
         if (targetName.isEmpty() || queryName.isEmpty() || outputString.isEmpty())
             return;
  
-        FileList targetFiles;
-        FileList queryFiles;
-        emptyRead(targetName, targetFiles, false);
-        emptyRead(queryName, queryFiles, false);
+        FileList targetFiles = FileList::fromGallery(targetName);
+        FileList queryFiles  = FileList::fromGallery(queryName);
  
         currentBlockRow = 0;
         currentBlockCol = 0;
@@ -314,11 +314,6 @@ struct WorkerProcess
     void mainLoop();
 };
  
-
-// Read metadata for all templates stored in the specified gallery, return the read
-// TeamplateList. If the gallery contains matrices, they are dropped.
-void emptyRead(const File & file, FileList & templates, bool cache = true);
-
 }
  
 #endif // OPENBR_INTERNAL_H