Added support for both date format to regex: dddd-dd-dd and dd-dd-dddd.

diff --git a/src/db/dbmediaimagecontainer.cpp b/src/db/dbmediaimagecontainer.cpp
index 3d2464b..e91edda 100644 (file)
--- a/src/db/dbmediaimagecontainer.cpp
+++ b/src/db/dbmediaimagecontainer.cpp
@@ -58,7 +58,7 @@ int DbMediaImageContainer::storeMediaImageContainer(EmuFrontObject *efo)
     QMap<QString, EmuFrontObject*> images = mic->getMediaImages();
     QList<int> ids = dbMediaImage->storeMediaImages(images);
 
-    qDebug() << "Stored " << ids.count() << " media images.";
+    //qDebug() << "Stored " << ids.count() << " media images.";
 
     if (ids.count() <= 0)
         return -1;
@@ -75,7 +75,7 @@ int DbMediaImageContainer::storeMediaImageContainer(EmuFrontObject *efo)
 
         fileId = insertDataObjectToModel(mic);
 
-        qDebug() << "Inserted media image container to file table with id " << fileId << ".";
+        //qDebug() << "Inserted media image container to file table with id " << fileId << ".";
 
         if (fileId < 0) {
             // TODO: note we most surely need to catch the exception
@@ -93,9 +93,9 @@ int DbMediaImageContainer::storeMediaImageContainer(EmuFrontObject *efo)
             DbFile::deleteDataObject(fileId);
             throw new EmuFrontException("Failed inserting media image to database!");
         }
-        qDebug() << "Inserted media image container " << fileId << " to mediaimagecontainer table.";
+        //qDebug() << "Inserted media image container " << fileId << " to mediaimagecontainer table.";
         linkMediaImagesWithContainer(fileId, images.values());
-        qDebug() << "Linked media image container with media images.";
+        //qDebug() << "Linked media image container with media images.";
     } catch (EmuFrontException e) {
         dbMediaImage->removeOrphanedMediaImages(ids);
         throw e;
@@ -127,7 +127,7 @@ QString DbMediaImageContainer::constructSelect(QString whereClause) const
                 "INNER JOIN mediatype ON setup.mediatypeid = mediatype.id "
                 "%1 "
                 "ORDER BY file.name").arg(whereClause);
-    qDebug() << select;
+    //qDebug() << select;
     return select;
 }
 
@@ -206,10 +206,9 @@ int DbMediaImageContainer::getMediaImageContainer(QString checksum) const
 */
 void DbMediaImageContainer::storeContainers(QList<MediaImageContainer *> lst, FilePathObject *fpo)
 {
-    qDebug() << "Storing media image containers to database.";
     foreach(MediaImageContainer *mic, lst)
     {
-        qDebug() << "Media image container " << mic->getName();
+        //qDebug() << "Media image container " << mic->getName();
         int micFileId = storeMediaImageContainer(mic);
     }
 }
@@ -222,8 +221,8 @@ void DbMediaImageContainer::linkMediaImagesWithContainer(int micId, QList<EmuFro
     MediaImage *mi = 0;
     foreach(EmuFrontObject *efo, mediaImages) {
         mi = dynamic_cast<MediaImage*>(efo);
-        qDebug() << "Linking media image container " << micId
-            << " to media image " << mi->getId()  << ", " << mi->getName() << ".";
+        /*qDebug() << "Linking media image container " << micId
+            << " to media image " << mi->getId()  << ", " << mi->getName() << ".";*/
         if (!linkMediaImageToMediaImageContainer(mi, micId)) {
                 throw new EmuFrontException(QString("Failed linking media "
                                                     "image container %1 to a media image %2").arg(micId).arg(mi->getId()));
@@ -233,8 +232,8 @@ void DbMediaImageContainer::linkMediaImagesWithContainer(int micId, QList<EmuFro
 
 void DbMediaImageContainer::filter(int mediaTypeId, int platformId)
 {
-    qDebug() << "Filtering media images with media type " << mediaTypeId
-        << " and platform " << platformId;
+    /*qDebug() << "Filtering media images with media type " << mediaTypeId
+        << " and platform " << platformId;*/
     QList<QString> filters;
     if (mediaTypeId >= 0)
         filters.append(QString("mediatype.id=%1").arg(mediaTypeId));

diff --git a/src/utils/unziphelper.cpp b/src/utils/unziphelper.cpp
index 625958f..d2d385b 100644 (file)
--- a/src/utils/unziphelper.cpp
+++ b/src/utils/unziphelper.cpp
@@ -53,7 +53,7 @@ QMap<QString, EmuFrontObject*> UnzipHelper::listContents(const QString filePath,
     command.append("\"");
     command.append(filePath);
     command.append("\"");
-    //qDebug() << command;
+    qDebug() << command;
     start(command);
     // TODO: slot(s) for (start and) error signal(s)
     bool procOk = waitForFinished();
@@ -62,7 +62,7 @@ QMap<QString, EmuFrontObject*> UnzipHelper::listContents(const QString filePath,
     }
     QString err = readAllStandardError();
     QString msg = readAllStandardOutput();
-    //qDebug() << "\nErrors:\n" << err << "\nMessage:\n" << msg;
+    qDebug() << "\nErrors:\n" << err << "\nMessage:\n" << msg;
 
     /*
 
@@ -111,7 +111,7 @@ QMap<QString, EmuFrontObject*> UnzipHelper::listContents(const QString filePath,
         "\\s+"
         "\\d{1,3}%"     // compression ratio
         "\\s+"
-        "\\d{4}-\\d{2}-\\d{2}" // date
+        "\\d{2,4}-\\d{2}-\\d{2,4}" // date
         "\\s+"
         "\\d{2}:\\d{2}" // time
         "\\s+"
@@ -122,21 +122,28 @@ QMap<QString, EmuFrontObject*> UnzipHelper::listContents(const QString filePath,
         );
     foreach(QString ln, lines) {
         //if (!test.exactMatch(ln)) continue;
+        qDebug() << "Current line is " << ln;
         int pos = regExEntries.indexIn(ln);
-        if (pos == -1) continue; // > no entries
+        if (pos == -1) {
+            qDebug() << "Regex didn't match any entries.";
+            continue; // > no entries
+        }
         entries = regExEntries.capturedTexts();
+        qDebug() << "Got " << entries.count() << " entries.";
         if (entries.count() < 4) continue;
         QString filename = entries[3];
         QString checksum = entries[2];
         QString lenStr = entries[1];
         bool ok;
         int length = lenStr.toInt(&ok);
+        qDebug() << "Filename is " << filename << " checksum "
+            << checksum << " length " << length;
         if (!ok) continue;
         MediaImage *effo = new MediaImage(filename, checksum, length);
         fileList[checksum] = effo;
     }
 
-    //qDebug() << "File list has " << fileList.size() << " entries.";
+    qDebug() << "File list has " << fileList.size() << " entries.";
     return fileList;
 }