Updated media image insertion code.

diff --git a/src/db/databasemanager.cpp b/src/db/databasemanager.cpp
index 64ed170..8c26071 100644 (file)
--- a/src/db/databasemanager.cpp
+++ b/src/db/databasemanager.cpp
@@ -113,10 +113,8 @@ EmuFrontObject* DatabaseManager::getDataObject(int id)
     return plf;*/
 }
 
-EmuFrontObject* DatabaseManager::getDataObject(QString filter)
+EmuFrontObject* DatabaseManager::getDataObject()
 {
-    qDebug() << "Filtering data object" << filter;
-    filterDataObjects(filter);
     qDebug() << "...done filtering.";
     return getFilteredDataObject();
 }

diff --git a/src/db/databasemanager.h b/src/db/databasemanager.h
index 77ac619..9ff9683 100644 (file)
--- a/src/db/databasemanager.h
+++ b/src/db/databasemanager.h
@@ -39,7 +39,7 @@ public:
     QSqlQueryModel* getDataModel();
     EmuFrontObject* getDataObjectFromModel(QModelIndex*);
     EmuFrontObject* getDataObject(int id);
-    EmuFrontObject* getDataObject(QString filter);
+    EmuFrontObject* getDataObject();
     virtual bool updateDataObjectToModel(const EmuFrontObject*) = 0;
     virtual bool insertDataObjectToModel(const EmuFrontObject*) = 0;
     virtual bool deleteDataObjectFromModel(QModelIndex*) = 0;

diff --git a/src/db/dbfile.cpp b/src/db/dbfile.cpp
index b0079f6..ac7d496 100644 (file)
--- a/src/db/dbfile.cpp
+++ b/src/db/dbfile.cpp
@@ -194,5 +194,6 @@ QSqlQueryModel* DbFile::getData()
 
 EmuFrontObject* DbFile::getFileByChecksum(QString checksum)
 {
-    return getDataObject(QString("checksum LIKE '%1'").arg(checksum));
+    filterDataObjects(QString("checksum LIKE '%1'").arg(checksum));
+    return getDataObject();
 }

diff --git a/src/db/dbfile.h b/src/db/dbfile.h
index 32276f2..20eb5b1 100644 (file)
--- a/src/db/dbfile.h
+++ b/src/db/dbfile.h
@@ -32,7 +32,7 @@ public:
     bool deleteDataObjectFromModel(QModelIndex*);
     int countDataObjectRefs(int) const;
     EmuFrontObject* getFileByChecksum(QString checksum);
-    int insertFile(const EmuFrontFile *);
+    //int insertFile(const EmuFrontFile *);
 
     enum {
         File_Id = 0,

diff --git a/src/db/dbmediaimage.cpp b/src/db/dbmediaimage.cpp
index a7e3c35..7b65bd2 100644 (file)
--- a/src/db/dbmediaimage.cpp
+++ b/src/db/dbmediaimage.cpp
@@ -28,7 +28,7 @@ DbMediaImage::DbMediaImage(QObject *parent)
     type = EmuFrontFile::FileType_MediaImage;
 }
 
-bool DbMediaImage::updateDataObjectToModel(const EmuFrontObject *efo)
+/*bool DbMediaImage::updateDataObjectToModel(const EmuFrontObject *efo)
 {
     // TODO
     return false;
@@ -68,19 +68,19 @@ EmuFrontObject* DbMediaImage::recordToDataObject(const QSqlRecord *)
 {
     // TODO
     return 0;
-}
+}*/
 
-QSqlQueryModel* DbMediaImage::getData()
+/*QSqlQueryModel* DbMediaImage::getData()
 {
     QSqlTableModel *model = new QSqlTableModel;
     model->setTable(DB_TABLE_NAME_FILE);
     return model;
-}
+}*/
 
-int DbMediaImage::insertMediaImage(const MediaImage *mi)
+/*int DbMediaImage::insertMediaImage(const MediaImage *mi)
 {
     return DbFile::insertDataObjectToModel(mi);
-}
+}*/
 
 QList<int> DbMediaImage::storeMediaImages(QList<MediaImage *> images)
 {
@@ -91,8 +91,6 @@ QList<int> DbMediaImage::storeMediaImages(QList<MediaImage *> images)
         QString cksum = mi->getCheckSum();
         qDebug() << "Storing media image " << mi->getName()
             << " with checksum " << cksum;
-        // TODO: Crashed: Filtering never gets to dbtablemodelmanagers
-        // filterDataObjects!
         EmuFrontObject *o = getFileByChecksum(cksum);
         int id = o ? o->getId() : -1;
         if (id >= 0)
@@ -104,7 +102,7 @@ QList<int> DbMediaImage::storeMediaImages(QList<MediaImage *> images)
         else if (id < 0)
         {
             qDebug() << "This media image is not yet in the db.";
-            id = insertMediaImage(mi);
+            id = insertDataObjectToModel(mi);
             if (id < 0)
             {
                 // TODO: Build an error message of failed inserts

diff --git a/src/db/dbmediaimage.h b/src/db/dbmediaimage.h
index 6d54c51..c08207b 100644 (file)
--- a/src/db/dbmediaimage.h
+++ b/src/db/dbmediaimage.h
@@ -23,13 +23,12 @@
 #include "dbfile.h"
 #include "../dataobjects/mediaimage.h"
 
-/* TODO: I suppose this class is not even needed anymore! */
 class DbMediaImage : public DbFile
 {
 public:
     DbMediaImage(QObject *parent);
     QList<int> storeMediaImages(QList<MediaImage*>);
-    virtual bool updateDataObjectToModel(const EmuFrontObject *);
+    /*virtual bool updateDataObjectToModel(const EmuFrontObject *);
     virtual bool insertDataObjectToModel(const EmuFrontObject *);
     virtual bool deleteDataObjectFromModel(QModelIndex *);
     virtual int countDataObjectRefs(int id) const;
@@ -40,7 +39,7 @@ protected:
     virtual QString constructSelectById(int id) const;
     virtual EmuFrontObject* recordToDataObject(const QSqlRecord *);
 private:
-    virtual QSqlQueryModel* getData();
+    virtual QSqlQueryModel* getData();*/
 };
 
 #endif // DBMEDIAIMAGE_H

diff --git a/src/db/dbmediaimagecontainer.cpp b/src/db/dbmediaimagecontainer.cpp
index d35a9a8..8888ade 100644 (file)
--- a/src/db/dbmediaimagecontainer.cpp
+++ b/src/db/dbmediaimagecontainer.cpp
@@ -23,7 +23,7 @@
 DbMediaImageContainer::DbMediaImageContainer(QObject *parent)
     : DbQueryModelManager(parent)
 {
-    dbMediaImage = 0;
+    dbMediaImage = new DbMediaImage(parent);
 }
 
 bool DbMediaImageContainer::updateDataObjectToModel(const EmuFrontObject *efo)