Removed signaling database updates from FileUtil to

[emufront] / src / utils / fileutil.cpp

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index 6ab5334..49ee35b 100644 (file)
--- a/src/utils/fileutil.cpp
+++ b/src/utils/fileutil.cpp
@@ -46,7 +46,7 @@ FileUtil::~FileUtil()
 /* Throws EmuFrontException */
 int FileUtil::scanFilePath(FilePathObject *fp,
     QStringList filters, DbMediaImageContainer *dbMic,
-    QProgressDialog &progressDialog)
+    QProgressDialog *progressDialog)
 {
     if (!fp->getSetup()){
         throw EmuFrontException(tr("Setup not available with %1.").arg(fp->getName()));
@@ -77,55 +77,64 @@ int FileUtil::scanFilePath(FilePathObject *fp,
     QFileInfoList list = dir.entryInfoList();
     //qDebug() << "We have " << list.count() << " files to go through.";
     QList<MediaImageContainer*> containers;
-    progressDialog.setMinimum(0);
-    progressDialog.setMaximum(list.size());
-    for (int i = 0; i < list.size(); ++i)
-    {
-        progressDialog.setValue(i);
-        if (progressDialog.wasCanceled())
-            break;
-        QFileInfo fileInfo = list.at(i);
-        //qDebug() << QString("%1 %2").arg(fileInfo.size(), 10).arg(fileInfo.absoluteFilePath());
-
-        //... and collect the contents of each archive
-        QMap<QString, EmuFrontObject*> files = unzipHelper->listContents(fileInfo.absoluteFilePath(), fp);
-
-        if (files.count() > 0)
+    try {
+        progressDialog->setMinimum(0);
+        progressDialog->setMaximum(list.size());
+        for (int i = 0; i < list.size(); ++i)
         {
-            // read crc32 checksum for media image container
-            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,
-                    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();
+            progressDialog->setValue(i);
+            if (progressDialog->wasCanceled())
+                break;
+            QFileInfo fileInfo = list.at(i);
+            //qDebug() << QString("%1 %2").arg(fileInfo.size(), 10).arg(fileInfo.absoluteFilePath());
+
+            //... and collect the contents of each archive
+            QMap<QString, EmuFrontObject*> files = unzipHelper->listContents(fileInfo.absoluteFilePath(), fp);
+
+            if (files.count() > 0)
+            {
+                // read crc32 checksum for media image container
+                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,
+                        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.";
+                    showDbUpdating(progressDialog);
+                    dbMic->storeContainers(containers, fp);
+                    hideDbUpdating(progressDialog);
+                    qDeleteAll(containers);
+                    containers.clear();
+                    //qDebug() << "containers now: " << containers.count();
+                }
+                //qDebug() << "We have " << containers.size() << " containers.";
+            } // files.count() > 0
+            else {
+                qDebug() << "No files from container " << fileInfo.absoluteFilePath();
             }
-            //qDebug() << "We have " << containers.size() << " containers.";
-        } // files.count() > 0
-        else {
-            qDebug() << "No files from container " << fileInfo.absoluteFilePath();
         }
-    }
-    progressDialog.setValue(list.size());
-    if (containers.count() > 0) {
-        //qDebug() << "Storing the rest " << containers.count() << " containers.";
-        dbMic->storeContainers(containers, fp);
+        progressDialog->setValue(list.size());
+        if (containers.count() > 0) {
+            //qDebug() << "Storing the rest " << containers.count() << " containers.";
+            //emit dbUpdateInProgress();
+            showDbUpdating(progressDialog);
+            dbMic->storeContainers(containers, fp);
+            hideDbUpdating(progressDialog);
+            //emit dbUpdateFinished();
+            qDeleteAll(containers);
+            containers.clear();
+ } } catch (EmuFrontException &e) { qDebug() << "Got exception " << e.what() << ", aborting & deleting created data objects.";
         qDeleteAll(containers);
-        containers.clear();
-
+        throw e;
     }
     //qDebug() << "Done scanning files!";
     return count;
@@ -158,3 +167,20 @@ bool FileUtil::isSupportedFile(const QString filename, const QStringList support
     QString ext = filename.section('.', -1);
     return supportedFileExtensions.contains(ext, Qt::CaseInsensitive);
 }
+
+void FileUtil::showDbUpdating(QProgressDialog *progressDialog)
+{
+    qDebug() << "DB updating";
+    // TODO: the following is not currently working
+    progressDialog->setWindowTitle(tr("Updating DB... please wait!"));
+    progressDialog->setEnabled(false);
+}
+
+void FileUtil::hideDbUpdating(QProgressDialog *progressDialog)
+{
+    qDebug() << "DB update finished";
+    // TODO: the following is not currently working
+    progressDialog->setEnabled(true);
+    progressDialog->setWindowTitle(tr("Scanning files"));
+}
+