Use BlockCompression in loadstores and algorithm serialization

Charles Otto
1 parent c04a5c97
Showing 2 changed files with 37 additions and 19 deletions
openbr/core/core.cpp
openbr/plugins/meta.cpp
@@ -110,9 +110,11 @@ struct AlgorithmCore
     void store(const QString &model) const
     {
-        // Create stream
-        QByteArray data;
-        QDataStream out(&data, QFile::WriteOnly);
+        QtUtils::BlockCompression compressedWrite;
+        QFile outFile(model);
+        compressedWrite.setBasis(&outFile);
+        QDataStream out(&compressedWrite);
+        compressedWrite.open(QFile::WriteOnly);
         // Serialize algorithm to stream
         transform->serialize(out);
@@ -131,18 +133,16 @@ struct AlgorithmCore
         if (mode == TransformCompare)
             comparison->serialize(out);
-        // Compress and save to file
-        QtUtils::writeFile(model, data, -1);
+        compressedWrite.close();
     }
     void load(const QString &model)
     {
-        // Load from file and decompress
-        QByteArray data;
-        QtUtils::readFile(model, data, true);
-
-        // Create stream
-        QDataStream in(&data, QFile::ReadOnly);
+        QtUtils::BlockCompression compressedRead;
+        QFile inFile(model);
+        compressedRead.setBasis(&inFile);
+        QDataStream in(&compressedRead);
+        compressedRead.open(QFile::ReadOnly);
         // Load algorithm
         transform = QSharedPointer<Transform>(Transform::deserialize(in));
@@ -17,6 +17,8 @@
 #include <QFutureSynchronizer>
 #include <QRegularExpression>
 #include <QtConcurrentRun>
+#include <qbuffer.h>
+
 #include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -553,7 +555,7 @@ private:
         return transform->timeVarying();
     }
-    void train(const TemplateList &data)
+    void train(const QList<TemplateList> &data)
     {
         if (QFileInfo(getFileName()).exists())
             return;
@@ -561,11 +563,20 @@ private:
         transform->train(data);
         qDebug("Storing %s", qPrintable(baseName));
-        QByteArray byteArray;
-        QDataStream stream(&byteArray, QFile::WriteOnly);
-        stream << transform->description();
+        QtUtils::BlockCompression compressedOut;
+        QFile fout(baseName);
+        QtUtils::touchDir(fout);
+        compressedOut.setBasis(&fout);
+
+        QDataStream stream(&compressedOut);
+        QString desc = transform->description();
+
+        if (!compressedOut.open(QFile::WriteOnly))
+            qFatal("Failed to open %s for writing.", qPrintable(file));
+
+        stream << desc;
         transform->store(stream);
-        QtUtils::writeFile(baseName, byteArray, -1);
+        compressedOut.close();
     }
     void project(const Template &src, Template &dst) const
@@ -606,12 +617,19 @@ private:
         if (file.isEmpty()) return false;
         qDebug("Loading %s", qPrintable(file));
-        QByteArray data;
-        QtUtils::readFile(file, data, true);
-        QDataStream stream(&data, QFile::ReadOnly);
+        QFile fin(file);
+        QtUtils::BlockCompression reader(&fin);
+        if (!reader.open(QIODevice::ReadOnly)) {
+            if (QFileInfo(file).exists()) qFatal("Unable to open %s for reading. Check file permissions.", qPrintable(file));
+            else            qFatal("Unable to open %s for reading. File does not exist.", qPrintable(file));
+        }
+
+        QDataStream stream(&reader);
         stream >> transformString;
+
         transform = Transform::make(transformString);
         transform->load(stream);
+
         return true;
     }
 };