FilePath object is also deleted when deleting a MediaImageContainer

[emufront] / src / utils / fileutil.cpp

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index a92f751..b537294 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,9 +11,17 @@
 #include "../dataobjects/platform.h"
 
 FileUtil::FileUtil(QObject *parent) : QObject(parent)
-{}
+{
+    buf = new char[READ_BUFFER];
+}
 
-QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QStringList filters)
+FileUtil::~FileUtil()
+{
+    delete[] buf;
+}
+
+/* Throws EmuFrontException */
+QList<MediaImageContainer*> FileUtil::scanFilePath(FilePathObject *fp, QStringList filters)
 {
     if (!fp->getSetup()){
         throw EmuFrontException(tr("Setup not available with %1.").arg(fp->getName()));
@@ -33,6 +42,7 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QSt
     if (!dir.exists() || !dir.isReadable())
         throw EmuFrontException(tr("Directory %1 doesn't exists or isn't readable!").arg(fp->getName()));
 
+    qDebug() << QString("Scanning directory %1.").arg(fp->getName());
     dir.setFilter(QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::Readable);
 
     if (filters.count() > 0) dir.setNameFilters(filters);
@@ -49,25 +59,43 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QSt
 
         if (files.count() > 0)
         {
+            quint32 crc = readCrc32(fileInfo.absoluteFilePath());
             MediaImageContainer *con = new MediaImageContainer
                 (
                     fileInfo.fileName(),
-                    "" /* TODO */,
+                    QString("%1").arg(crc, 0, 16),
                     fileInfo.size(),
                     files,
-                    // TODO: is it guaranteed, that the file path object containing the setup object remains alive
-                    // the whole lifecycle of (this) media image container object?
-                    // * if we assign a copy of the setup object -> waste of memory and time
-                    // * this function is designed to be used from media image path main dialog
-                    //   where we can ensure the lifecycle of file path object -> maybe move the implementation there!?
-                    fp->getSetup()
+                    new FilePathObject(*fp)
                 );
             containers.append(con);
+            qDebug() << "We have " << containers.size() << " containers.";
         }
     }
+    qDebug() << "Done scanning files!";
     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)
 {
 
@@ -76,20 +104,27 @@ QList<MediaImage*> FileUtil::listContents(const QString filePath, const FilePath
     if (ec != UnZip::Ok)
         throw EmuFrontException(tr("Error while opening zip-file %1, error code %2").arg(filePath).arg(ec));
 
+    if (!fp->getSetup()){
+        throw EmuFrontException(tr("Setup not available with %1.").arg(fp->getName()));
+    }
+
     Setup *sup = fp->getSetup();
     QList<UnZip::ZipEntry> list = uz.entryList();
     QList<MediaImage*>  fileList;
     foreach(UnZip::ZipEntry entry, list)
     {
+        qDebug() << "Zip entry " << entry.filename;
         if (isSupportedFile(entry.filename, sup->getSupportedFileTypeExtensions()))
         {
             QString checksum = QString("%1").arg(entry.crc32, 0, 16);
+            qDebug() << "Checksum " << checksum;
             MediaImage *effo = new MediaImage(entry.filename,
                 checksum, entry.uncompressedSize);
             fileList << effo;
         }
     }
 
+    qDebug() << "File list has " << fileList.size() << " entries.";
     return fileList;
 
 }