added support to preserve file paths when enrolling to a folder

Josh Klontz
1 parent a29b78a7
Showing 5 changed files with 23 additions and 2 deletions
sdk/core/qtutils.cpp
sdk/core/qtutils.h
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/gallery.cpp
@@ -121,6 +121,15 @@ void QtUtils::writeFile(const QString &amp;file, const QByteArray &amp;data, int compres
     }
 }
+void QtUtils::copyFile(const QString &src, const QString &dst)
+{
+    touchDir(QFileInfo(dst));
+    if (!QFile::copy(src, dst)) {
+        if (QFileInfo(src).exists()) qFatal("Unable to copy %s to %s. Check file permissions.", qPrintable(src), qPrintable(dst));
+        else                         qFatal("Unable to copy %s to %s. File does not exist.", qPrintable(src), qPrintable(dst));
+    }
+}
+
 void QtUtils::touchDir(const QDir &dir)
 {
     if (dir.exists(".")) return;
@@ -39,6 +39,7 @@ namespace QtUtils
     void writeFile(const QString &file, const QStringList &lines);
     void writeFile(const QString &file, const QString &data);
     void writeFile(const QString &file, const QByteArray &data, int compression = 0);
+    void copyFile(const QString &src, const QString &dst);
     /**** Directory Utilities ****/
     void touchDir(const QDir &dir);
@@ -148,6 +148,14 @@ void File::set(const QString &amp;key, const QVariant &amp;value)
     m_metadata.insert(key, value);
 }
+bool File::getBool(const QString &key) const
+{
+    if (!contains(key)) return false;
+    QVariant variant = value(key);
+    if (variant.isNull() || !variant.canConvert<bool>()) return true;
+    return variant.value<bool>();
+}
+
 QString File::subject(int label)
 {
     return Globals->classes.key(label, QString::number(label));
@@ -206,6 +206,9 @@ struct BR_EXPORT File
         return variant.value<T>();
     }
+    /*!< \brief Specialization for boolean type. */
+    bool getBool(const QString &key) const;
+
     /*!< \brief Returns a value for the key, returning \em defaultValue if the key does not exist or can't be converted. */
     template <typename T>
     T get(const QString &key, const T &defaultValue) const
@@ -127,10 +127,10 @@ class EmptyGallery : public Gallery
         // Enrolling a null file is used as an idiom to initialize an algorithm
         if (file.name.isEmpty()) return;
-        const QString destination = file.name + "/" + t.file.fileName();
+        const QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.name : t.file.fileName());
         QMutexLocker diskLocker(&diskLock); // Windows prefers to crash when writing to disk in parallel
         if (t.isNull()) {
-            QFile::copy(t.file.resolved(), destination);
+            QtUtils::copyFile(t.file.resolved(), destination);
         } else {
             QScopedPointer<Format> format(Factory<Format>::make(destination));
             format->write(t);