Added reading of CRC32 checksum for media image containers using zlib.h.

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index 126bb09..b2ec899 100644 (file)
--- a/src/utils/fileutil.cpp
+++ b/src/utils/fileutil.cpp
@@ -1,6 +1,7 @@
 #include <QDir>
 #include <QDebug>
 #include "fileutil.h"
+#include "zlib.h" /* crc32 */
 #include "OSDaB-Zip/unzip.h"
 #include "../exceptions/emufrontexception.h"
 #include "../dataobjects/setup.h"
@@ -10,7 +11,14 @@
 #include "../dataobjects/platform.h"
 
 FileUtil::FileUtil(QObject *parent) : QObject(parent)
-{}
+{
+    buf = new char[READ_BUFFER];
+}
+
+FileUtil::~FileUtil()
+{
+    delete[] buf;
+}
 
 QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QStringList filters)
 {
@@ -50,10 +58,11 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QSt
 
         if (files.count() > 0)
         {
+            quint32 crc = readCrc32(fileInfo.absoluteFilePath());
             MediaImageContainer *con = new MediaImageContainer
                 (
                     fileInfo.fileName(),
-                    "" /* TODO: count checksum! */,
+                    QString("%1").arg(crc, 0, 16),
                     fileInfo.size(),
                     files,
                     // TODO: is it guaranteed, that the file path object containing the setup object remains alive
@@ -72,6 +81,26 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QSt
     return containers;
 }
 
+/* Uses crc32 from zlib.h to count crc32 checksum value */
+quint32 FileUtil::readCrc32(QString filePath)
+{
+    QFile file(filePath);
+    qDebug() << "readCrc32: " << filePath;
+    if (!file.open(QIODevice::ReadOnly)) {
+        throw new EmuFrontException(QString(tr("Failed opening file %1 for reading the checksum!")).arg(filePath));
+    }
+    quint32 crc = crc32(0L, Z_NULL, 0);
+    int read = 0;
+    while((read = file.read(buf, READ_BUFFER))) {
+        crc = crc32(crc, (const Bytef*) buf, read);
+    }
+    file.close();
+    if (crc <= 0)
+        throw new EmuFrontException(QString(tr("Failed reading crc checksum for file %1!")).arg(filePath));
+    qDebug() << QString("readCrc32, crc: %1").arg(crc, 0, 16);
+    return crc;
+}
+
 QList<MediaImage*> FileUtil::listContents(const QString filePath, const FilePathObject *fp)
 {
 

diff --git a/src/utils/fileutil.h b/src/utils/fileutil.h
index e9f665a..76ad3ba 100644 (file)
--- a/src/utils/fileutil.h
+++ b/src/utils/fileutil.h
@@ -5,19 +5,21 @@
 #include "../dataobjects/emufrontfileobject.h"
 #include "../dataobjects/filepathobject.h"
 
+#define READ_BUFFER (256*1024)
+
 class QStringList;
 class MediaImageContainer;
 class MediaImage;
 
 class FileUtil : QObject
 {
-
-
 public:
     FileUtil(QObject *parent);
-
+    ~FileUtil();
     QList<MediaImageContainer*> scanFilePath(const FilePathObject *fpo, const QStringList filters);
 private:
+    char *buf;
+    quint32 readCrc32(QString filePath);
     QList<MediaImage*>  listContents(const QString filePath, const FilePathObject *fp);
     bool isSupportedFile(const QString filename, const QStringList supportedFileExtensions);
 };