Merge pull request #912 from ElderOrb/xml_parsing_fix

analysis GUI blank until forced to generate new xml #869
mipops · Jul 28, 2024 · 8e09e0e · 8e09e0e
2 parents e47d8a9 + 5e96945
commit 8e09e0e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/Source/GUI/dvrescue/dvrescue.tests/xmlparsingtest.cpp b/Source/GUI/dvrescue/dvrescue.tests/xmlparsingtest.cpp
@@ -15,9 +15,9 @@ XmlParsingTest::XmlParsingTest(QObject *parent) : QObject(parent)
 
 }
 
-void XmlParsingTest::f1()
+int XmlParsingTest::parse(QString fileName)
 {
-    QFile file(":/testdata/sample.xml");
+    QFile file(fileName);
     bool opened = file.open(QIODevice::ReadOnly);
 
     qDebug() << "file: " << opened << file.size();
@@ -41,6 +41,14 @@ void XmlParsingTest::f1()
 
     parser.exec(&file);
 
+    return totalFrames;
+}
+
+void XmlParsingTest::f1()
+{
+    auto fileName = ":/testdata/sample.xml";
+    auto totalFrames = parse(fileName);
+
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 
     QXmlQuery query;
@@ -74,3 +82,22 @@ void XmlParsingTest::f2()
 {
 
 }
+
+void XmlParsingTest::parseFile()
+{
+    auto totalFrames = parse(fileName());
+    qDebug() << "totalFrames: " << totalFrames;
+}
+
+QString XmlParsingTest::fileName() const
+{
+    return m_fileName;
+}
+
+void XmlParsingTest::setFileName(const QString &newFileName)
+{
+    if (m_fileName == newFileName)
+        return;
+    m_fileName = newFileName;
+    emit fileNameChanged();
+}
diff --git a/Source/GUI/dvrescue/dvrescue.tests/xmlparsingtest.h b/Source/GUI/dvrescue/dvrescue.tests/xmlparsingtest.h
@@ -6,14 +6,26 @@
 class XmlParsingTest : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged FINAL)
 public:
     explicit XmlParsingTest(QObject *parent = nullptr);
 
+    QString fileName() const;
+    void setFileName(const QString &newFileName);
+
 Q_SIGNALS:
+    void fileNameChanged();
 
 private Q_SLOTS:
     void f1();
     void f2();
+    void parseFile();
+
+private:
+    int parse(QString fileName);
+
+private:
+    QString m_fileName;
 };
 
 #endif // XMLPARSINGTEST_H
diff --git a/Source/GUI/dvrescue/dvrescue/xmlparser.cpp b/Source/GUI/dvrescue/dvrescue/xmlparser.cpp
@@ -92,6 +92,8 @@ void XmlParser::parseMedia(QXmlStreamReader &xml)
             if(firstFrames)
                 firstFrames = false;
         }
+
+        xml.skipCurrentElement();
     }
 }