Media image container scanning has now a buffer. Scanned media image

container objects have now a copy of original file path object instead
of a reference. Fixed a nasty bug in EmuFrontFileObjext copy
constructor!

diff --git a/src/dataobjects/emufrontfileobject.cpp b/src/dataobjects/emufrontfileobject.cpp
index d817bbf..c60c895 100644 (file)
--- a/src/dataobjects/emufrontfileobject.cpp
+++ b/src/dataobjects/emufrontfileobject.cpp
@@ -26,10 +26,10 @@ EmuFrontFileObject::EmuFrontFileObject(int id, QString name, EmuFrontFile *file)
     : EmuFrontObject(id, name), file(file) {}
 
 EmuFrontFileObject::EmuFrontFileObject(const EmuFrontFileObject &pl)
-    : EmuFrontObject(pl.id, pl.name)
+    : EmuFrontObject(pl)
 {
     EmuFrontFile *f = pl.file;
-    file = new EmuFrontFile(*f);
+    file = f ? new EmuFrontFile(*f) : 0;
 }
 
 EmuFrontFileObject::~EmuFrontFileObject()

diff --git a/src/dataobjects/emufrontobject.cpp b/src/dataobjects/emufrontobject.cpp
index db036ea..a86ef58 100644 (file)
--- a/src/dataobjects/emufrontobject.cpp
+++ b/src/dataobjects/emufrontobject.cpp
@@ -24,8 +24,10 @@ EmuFrontObject::EmuFrontObject() : id(-1), name("")
 }
 
 EmuFrontObject::EmuFrontObject(const EmuFrontObject &ob)
-    : QObject(), id(ob.id), name(ob.name)
+    //: QObject(ob) //, id(ob.id), name(ob.name)
 {
+    id = ob.id;
+    name = ob.name;
     // no need to perform deep copy here, see:
     // http://doc.trolltech.com/4.0/shclass.html
 }

diff --git a/src/dataobjects/filepathobject.cpp b/src/dataobjects/filepathobject.cpp
index 9629bad..93f3da8 100644 (file)
--- a/src/dataobjects/filepathobject.cpp
+++ b/src/dataobjects/filepathobject.cpp
@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <QDebug>
 #include "filepathobject.h"
 #include "setup.h"
 
@@ -35,9 +36,12 @@ FilePathObject::~FilePathObject()
 }
 
 FilePathObject::FilePathObject(const FilePathObject &fpobj)
-    : EmuFrontObject(fpobj.id, fpobj.name), type(fpobj.type)
+    : EmuFrontObject(fpobj), type(fpobj.type)
 {
+    qDebug() << "FilePathObject copy constructor.";
     Setup *s = fpobj.setup;
+    qDebug() << "Setup name " << s->getName();
+    qDebug() << "Setup id " << s->getId();
     setup = new Setup(*s);
 }
 

diff --git a/src/dataobjects/mediatype.cpp b/src/dataobjects/mediatype.cpp
index 8a87a84..3f695a3 100644 (file)
--- a/src/dataobjects/mediatype.cpp
+++ b/src/dataobjects/mediatype.cpp
@@ -27,3 +27,8 @@ MediaType::MediaType(int id, QString name, EmuFrontFile *file)
         : EmuFrontFileObject(id, name, file)
 {
 }
+
+MediaType::MediaType(const MediaType &mt)
+        : EmuFrontFileObject(mt)
+{
+}

diff --git a/src/dataobjects/mediatype.h b/src/dataobjects/mediatype.h
index 29711e7..0323237 100644 (file)
--- a/src/dataobjects/mediatype.h
+++ b/src/dataobjects/mediatype.h
@@ -28,6 +28,7 @@ public:
     MediaType();
     MediaType(int id, QString name);
     MediaType(int id, QString name, EmuFrontFile*);
+    MediaType(const MediaType &);
 };
 
 #endif // MEDIATYPE_H

diff --git a/src/dataobjects/platform.cpp b/src/dataobjects/platform.cpp
index 7f7cb66..8be339d 100644 (file)
--- a/src/dataobjects/platform.cpp
+++ b/src/dataobjects/platform.cpp
@@ -28,3 +28,9 @@ Platform::Platform(int id, QString name, EmuFrontFile *file)
         : EmuFrontFileObject(id, name, file)
 {
 }
+
+Platform::Platform(const Platform &p)
+        : EmuFrontFileObject(p)
+{
+}
+

diff --git a/src/dataobjects/platform.h b/src/dataobjects/platform.h
index 3ae59b7..994e9b4 100644 (file)
--- a/src/dataobjects/platform.h
+++ b/src/dataobjects/platform.h
@@ -28,6 +28,7 @@ public:
     Platform();
     Platform(int id, QString name);
     Platform(int id, QString name, EmuFrontFile*);
+    Platform(const Platform &);
 };
 
 #endif // PLATFORM_H

diff --git a/src/dataobjects/setup.cpp b/src/dataobjects/setup.cpp
index 17ee114..d03f4a1 100644 (file)
--- a/src/dataobjects/setup.cpp
+++ b/src/dataobjects/setup.cpp
@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <QDebug>
 #include "setup.h"
 #include "platform.h"
 #include "mediatype.h"
@@ -41,11 +42,13 @@ Setup::~Setup()
 }
 
 Setup::Setup(const Setup &s)
-        : EmuFrontObject(s.getId(), s.getName()),
+        : EmuFrontObject(s),
             fileTypeExtensions(s.fileTypeExtensions)
 {
     Platform *p = s.platform;
     MediaType *m = s.mediaType;
+    qDebug() << "Setup copy constructor, platform is "
+        << p->getName() <<  p->getId() << ", mediatype is " << m->getName() << m->getId();
     platform = new Platform(*p);
     mediaType = new MediaType(*m);
 }

diff --git a/src/db/dbcreator.cpp b/src/db/dbcreator.cpp
index a726ca2..4ec65de 100644 (file)
--- a/src/db/dbcreator.cpp
+++ b/src/db/dbcreator.cpp
@@ -162,6 +162,14 @@ bool DbCreator::createDB()
             "END;"
             );
 
+        query.exec(
+            "CREATE TRIGGER IF NOT EXISTS trg_onfilepathdelete "
+            "AFTER DELETE ON filepath "
+            "BEGIN "
+            "   DELETE FROM mediaimagecontainer WHERE filepathid=old.id; "
+            "END;"
+        );
+
         // NOTE:
         // media image container is not explicitily deleted,
         // mediaimagecontainer entry should be deleted implicitely with

diff --git a/src/db/dbemufrontfileobject.cpp b/src/db/dbemufrontfileobject.cpp
index 0ee19a5..73200c9 100644 (file)
--- a/src/db/dbemufrontfileobject.cpp
+++ b/src/db/dbemufrontfileobject.cpp
@@ -87,7 +87,7 @@ int DbEmuFrontFileObject::insertDataObjectToModel(const EmuFrontObject *ob)
     return id;
 }
 
-bool DbEmuFrontFileObject::deleteDataObject(int id) const
+/*bool DbEmuFrontFileObject::deleteDataObject(int id) const
 {
     if (countDataObjectRefs(id) > 0)
         // TODO
@@ -97,7 +97,7 @@ bool DbEmuFrontFileObject::deleteDataObject(int id) const
     q.bindValue(":id", id);
     return q.exec();
 
-}
+}*/
 
 // WARNING: this will delete also all the databindings to selected platform
 bool DbEmuFrontFileObject::deleteDataObjectFromModel(QModelIndex *index)

diff --git a/src/db/dbemufrontfileobject.h b/src/db/dbemufrontfileobject.h
index d863a9b..0ac48bb 100644 (file)
--- a/src/db/dbemufrontfileobject.h
+++ b/src/db/dbemufrontfileobject.h
@@ -48,7 +48,7 @@ protected:
    virtual QString constructFilterById(int id) const;
    virtual EmuFrontObject* recordToDataObject(const QSqlRecord* );
    virtual EmuFrontObject* createEmuFrontFileObject(int id, QString name, EmuFrontFile *f) = 0;
-   virtual bool deleteDataObject(int id) const;
+   //virtual bool deleteDataObject(int id) const;
 
 private:
     virtual QSqlQueryModel* getData();

diff --git a/src/db/dbquerymodelmanager.cpp b/src/db/dbquerymodelmanager.cpp
index 94faead..dac0326 100644 (file)
--- a/src/db/dbquerymodelmanager.cpp
+++ b/src/db/dbquerymodelmanager.cpp
@@ -19,6 +19,7 @@
 
 #include <QSqlQuery>
 #include <QSqlQueryModel>
+#include <QSqlError>
 #include <QDebug>
 #include "dbquerymodelmanager.h"
 
@@ -65,10 +66,16 @@ void DbQueryModelManager::clearFilters()
 
 bool DbQueryModelManager::deleteDataObject(int id) const
 {
+    QString sql = getDeleteObjectSql();
+    qDebug() << sql;
     QSqlQuery q;
-    q.prepare(getDeleteObjectSql());
+    q.prepare(sql);
     q.bindValue(":id", id);
-    return q.exec();
+    bool ret =  q.exec();
+    if (!ret) {
+           qDebug() << q.lastError().text();
+    }
+    return ret;
 }
 
 QString DbQueryModelManager::getDeleteObjectSql() const

diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index 084bef1..749ebfb 100644 (file)
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -68,12 +68,8 @@ void MediaImagePathMainDialog::beginScanFilePath()
         QStringList l;
         l << "*.zip"; // TODO set filters in a global constant class
 
-        QList<MediaImageContainer*> files = fileUtil.scanFilePath(fpo, l);
-        qDebug() << "Storing scanned " << files.size() << " files to database";
-        dbMediaImageContainer->storeContainers(files, fpo);
-        qDebug() << "Done storing scanned " << files.size() << " files to database";
-        // the media image and media image container objects can be deleted now
-        qDeleteAll(files);
+        int count = fileUtil.scanFilePath(fpo, l, dbMediaImageContainer);
+        qDebug() << "Storing scanned " << count << " files to database";
         delete fpo;
     }
     catch (EmuFrontException s)

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index 33198e6..0b18ee2 100644 (file)
--- a/src/utils/fileutil.cpp
+++ b/src/utils/fileutil.cpp
@@ -28,6 +28,9 @@
 #include "../dataobjects/mediaimagecontainer.h"
 #include "../dataobjects/mediatype.h"
 #include "../dataobjects/platform.h"
+#include "../db/dbmediaimagecontainer.h"
+
+//int FileUtil::MIC_BUFFER_SIZE = 50;
 
 FileUtil::FileUtil(QObject *parent) : QObject(parent)
 {
@@ -40,7 +43,7 @@ FileUtil::~FileUtil()
 }
 
 /* Throws EmuFrontException */
-QList<MediaImageContainer*> FileUtil::scanFilePath(FilePathObject *fp, QStringList filters)
+int FileUtil::scanFilePath(FilePathObject *fp, QStringList filters, DbMediaImageContainer *dbMic)
 {
     if (!fp->getSetup()){
         throw EmuFrontException(tr("Setup not available with %1.").arg(fp->getName()));
@@ -53,10 +56,10 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(FilePathObject *fp, QStringLi
         throw new EmuFrontException(tr("No media type available with %1.")
             .arg(fp->getSetup()->getName()));
     }
+    int count = 0;
     qDebug() << QString("We have a platform %1, media type %2")
         .arg(fp->getSetup()->getPlatform()->getName())
         .arg(fp->getSetup()->getMediaType()->getName());
-    QList<MediaImageContainer*> containers;
     QDir dir(fp->getName());
     if (!dir.exists() || !dir.isReadable())
         throw EmuFrontException(tr("Directory %1 doesn't exists or isn't readable!").arg(fp->getName()));
@@ -68,6 +71,9 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(FilePathObject *fp, QStringLi
 
     // we'll go through the filtered archive files...
     QFileInfoList list = dir.entryInfoList();
+    // TODO: only a buffer of objects should be kept here,
+    // and write to database each time the buffer is filled.
+    QList<MediaImageContainer*> containers;
     for (int i = 0; i < list.size(); ++i)
     {
         QFileInfo fileInfo = list.at(i);
@@ -79,20 +85,39 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(FilePathObject *fp, QStringLi
         if (files.count() > 0)
         {
             quint32 crc = readCrc32(fileInfo.absoluteFilePath());
+            FilePathObject *fpo = new FilePathObject(*fp);
             MediaImageContainer *con = new MediaImageContainer
                 (
                     fileInfo.fileName(),
                     QString("%1").arg(crc, 0, 16),
                     fileInfo.size(),
                     files,
-                    new FilePathObject(*fp)
+                    fpo // we need a copy since MediaImageContainers are deleted and the original filepath object would get deleted also.
                 );
             containers.append(con);
+            ++count;
+            qDebug() << "We have " << containers.count() << " containers.";
+
+            if (containers.count() >= MIC_BUFFER_SIZE)  {
+                qDebug() << "We have " << containers.count()
+                    << " containers .. storing to db.";
+                dbMic->storeContainers(containers, fp);
+                qDeleteAll(containers);
+                containers.clear();
+                qDebug() << "containers now: " << containers.count();
+            }
             qDebug() << "We have " << containers.size() << " containers.";
         }
     }
+    if (containers.count() > 0) {
+        qDebug() << "Storing the rest " << containers.count() << " containers.";
+        dbMic->storeContainers(containers, fp);
+        qDeleteAll(containers);
+        containers.clear();
+
+    }
     qDebug() << "Done scanning files!";
-    return containers;
+    return count;
 }
 
 /* Uses crc32 from zlib.h to count crc32 checksum value */

diff --git a/src/utils/fileutil.h b/src/utils/fileutil.h
index 0dd4018..8a4cf2a 100644 (file)
--- a/src/utils/fileutil.h
+++ b/src/utils/fileutil.h
@@ -29,18 +29,20 @@
 class QStringList;
 class MediaImageContainer;
 class MediaImage;
+class DbMediaImageContainer;
 
 class FileUtil : QObject
 {
 public:
     FileUtil(QObject *parent);
     ~FileUtil();
-    QList<MediaImageContainer*> scanFilePath(FilePathObject *fpo, const QStringList filters);
+    int scanFilePath(FilePathObject *fpo, const QStringList filters, DbMediaImageContainer *mic);
 private:
     char *buf;
     quint32 readCrc32(QString filePath);
     QList<MediaImage*>  listContents(const QString filePath, const FilePathObject *fp);
     bool isSupportedFile(const QString filename, const QStringList supportedFileExtensions);
+    static const int MIC_BUFFER_SIZE = 50;
 };
 
 #endif // FILEUTIL_H