Implementing media image and media image container classes.

diff --git a/src/dataobjects/mediaimage.cpp b/src/dataobjects/mediaimage.cpp
index 8696d7d..2ac3d3e 100644 (file)
--- a/src/dataobjects/mediaimage.cpp
+++ b/src/dataobjects/mediaimage.cpp
@@ -20,5 +20,9 @@
 #include "mediaimage.h"
 
 MediaImage::MediaImage()
-{
-}
+    : EmuFrontFileObject()
+{ }
+
+MediaImage::MediaImage(int id, QString name, EmuFrontFile *file)
+    : EmuFrontFileObject(id, name, file) { }
+

diff --git a/src/dataobjects/mediaimage.h b/src/dataobjects/mediaimage.h
index 5b2aa1f..5dc504a 100644 (file)
--- a/src/dataobjects/mediaimage.h
+++ b/src/dataobjects/mediaimage.h
@@ -14,7 +14,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You shortould have received a copy of the GNU General Public License
 // along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef MEDIAIMAGE_H
@@ -26,6 +26,7 @@ class MediaImage : public EmuFrontFileObject
 {
 public:
     MediaImage();
+    MediaImage(int id, QString name, EmuFrontFile *file);
 };
 
 #endif // MEDIAIMAGE_H

diff --git a/src/dataobjects/mediaimagecontainer.cpp b/src/dataobjects/mediaimagecontainer.cpp
index 6c5b768..31a691d 100644 (file)
--- a/src/dataobjects/mediaimagecontainer.cpp
+++ b/src/dataobjects/mediaimagecontainer.cpp
@@ -19,6 +19,6 @@
 
 #include "mediaimagecontainer.h"
 
-MediaImageContainer::MediaImageContainer()
+MediaImageContainer::MediaImageContainer() : EmuFrontFileObject()
 {
 }

diff --git a/src/dataobjects/mediaimagecontainer.h b/src/dataobjects/mediaimagecontainer.h
index 04f654c..3712409 100644 (file)
--- a/src/dataobjects/mediaimagecontainer.h
+++ b/src/dataobjects/mediaimagecontainer.h
@@ -21,11 +21,17 @@
 #define MEDIAIMAGECONTAINER_H
 
 #include "emufrontfileobject.h"
+#include "mediaimage.h"
 
 class MediaImageContainer : public EmuFrontFileObject
 {
 public:
     MediaImageContainer();
+    QList<MediaImage*> getMediaImages();
+    void setMediaImages(QList<MediaImage*>);
+    void addMediaImage(MediaImage*);
+private:
+    QList<MediaImage*> lstMediaImage;
 };
 
 #endif // MEDIAIMAGECONTAINER_H

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index 9e0d777..0fb4f45 100644 (file)
--- a/src/utils/fileutil.cpp
+++ b/src/utils/fileutil.cpp
@@ -40,7 +40,8 @@ QList<MediaImageContainer*> FileUtil::scanFilePath(const FilePathObject *fp, QSt
         // - time created / updated
         if (files.count() > 0)
         {
-            MediaImageContainer *con = new MediaImageContainer();
+            MediaImageContainer *con = new MediaImageContainer;
+
             containers.append(con);
         }
 
@@ -65,13 +66,16 @@ QList<MediaImage*> FileUtil::listContents(const QString filePath, const FilePath
     QList<MediaImage*>  fileList;
     foreach(UnZip::ZipEntry entry, list)
     {
-        qDebug() << "We have an entry " << entry.filename
-            << "with crc32 " << entry.crc32
-            << " and file size " << entry.uncompressedSize;
-
         if (isSupportedFile(entry.filename, sup->getSupportedFileTypeExtensions()))
         {
-            MediaImage *effo = new MediaImage();
+            QString checksum = QString("%1").arg(entry.crc32, 0, 16);
+            EmuFrontFile *eff = new EmuFrontFile;
+            eff->setName(entry.filename);
+            eff->setCheckSum(checksum);
+            eff->setSize(entry.uncompressedSize);
+            eff->setType(EmuFrontFile::FileType_MediaImage);
+            MediaImage *effo = new MediaImage;
+            effo->setFile(eff);
             fileList << effo;
         }
     }