Fixed error in regexp in fileutils.

diff --git a/src/emulauncher.cpp b/src/emulauncher.cpp
index 57feccf..a8c0390 100644 (file)
--- a/src/emulauncher.cpp
+++ b/src/emulauncher.cpp
@@ -194,6 +194,7 @@ void EmuLauncher::launch(const Executable * ex, const MediaImageContainer * mic)
     // to emulator command line.
     QString opts = ex->getOptions();
     QString tmpfp = " \"/tmp/";
+    qDebug() << "Launching file '" << mic->getMediaImages().first()->getName() << " '";
     tmpfp.append(mic->getMediaImages().first()->getName()).append("\"");
     opts.replace("$1", tmpfp);
     QString cmdWithParams;

diff --git a/src/utils/fileutil.cpp b/src/utils/fileutil.cpp
index 4b2f0cb..5a6678e 100644 (file)
--- a/src/utils/fileutil.cpp
+++ b/src/utils/fileutil.cpp
@@ -213,14 +213,10 @@ QList<MediaImage*> FileUtil::listContents(const QString filePath, const FilePath
         );
     QStringList entries;
     QRegExp test("^\\s+\\d+\\s+[A-Za-z:]*\\s+\\d+\\s+\\d{1,3}%\\s+\\d{4}-\\d{2}-\\d{2}\\s+\\d{2}:\\d{2}\\s+[0-9a-f]{8}\\s+.+$");
-    QRegExp regExEntries("^\\s+(\\d+)\\s+[A-Za-z:]*\\s+\\d+\\s+\\d{1,3}%\\s+\\d{4}-\\d{2}-\\d{2}\\s+\\d{2}:\\d{2}\\s+([0-9a-f]{8})\\s+(.+)$");
+    QRegExp regExEntries("^\\s+(\\d+)\\s+[A-Za-z:]*\\s+\\d+\\s+\\d{1,3}%\\s+\\d{4}-\\d{2}-\\d{2}\\s+\\d{2}:\\d{2}\\s+([0-9a-f]{8})\\s+(\\S.+)$");
     foreach(QString ln, lines) {
         if (!test.exactMatch(ln)) continue;
         int pos = regExEntries.indexIn(ln);
-        if (regExEntries.captureCount() != 3) {
-            continue;
-            //throw new EmuFrontException(tr("Failed to read needed data from file %1.").arg(filePath));
-        }
         entries = regExEntries.capturedTexts();
         if (entries.count() < 4) continue;
         QString filename = entries[3];
@@ -230,6 +226,7 @@ QList<MediaImage*> FileUtil::listContents(const QString filePath, const FilePath
         int length = lenStr.toInt(&ok);
         if (!ok) continue;
         MediaImage *effo = new MediaImage(filename, checksum, length);
+        fileList << effo;
     }
 
     /*UnZip uz;