various: use simpler/smarter XML reading functions

Should address any XML parsing issues and allows for simpler, more maintainable
code. Should also address a crash that could occur when pasting nodes that had
inputs that weren't copied.

app/project/item/folder/folder.cpp

@@ -46,37 +46,38 @@ QIcon Folder::icon()
 
 void Folder::Load(QXmlStreamReader *reader, QHash<quintptr, StreamPtr> &footage_ptrs, QList<NodeParam::FootageConnection>& footage_connections, const QAtomicInt *cancelled)
 {
+  qDebug() << "Hello?";
+
   XMLAttributeLoop(reader, attr) {
     if (cancelled && *cancelled) {
       return;
     }
 
-    if (attr.name() == "name") {
+    if (attr.name() == QStringLiteral("name")) {
       set_name(attr.value().toString());
     }
   }
 
-  XMLReadLoop(reader, "folder") {
+  while (XMLReadNextStartElement(reader)) {
     if (cancelled && *cancelled) {
       return;
     }
 
-    if (reader->isStartElement()) {
-      ItemPtr child;
+    ItemPtr child;
 
-      if (reader->name() == "folder") {
-        child = std::make_shared<Folder>();
-      } else if (reader->name() == "footage") {
-        child = std::make_shared<Footage>();
-      } else if (reader->name() == "sequence") {
-        child = std::make_shared<Sequence>();
-      } else {
-        continue;
-      }
-
-      add_child(child);
-      child->Load(reader, footage_ptrs, footage_connections, cancelled);
+    if (reader->name() == QStringLiteral("folder")) {
+      child = std::make_shared<Folder>();
+    } else if (reader->name() == QStringLiteral("footage")) {
+      child = std::make_shared<Footage>();
+    } else if (reader->name() == QStringLiteral("sequence")) {
+      child = std::make_shared<Sequence>();
+    } else {
+      reader->skipCurrentElement();
+      continue;
     }
+
+    add_child(child);
+    child->Load(reader, footage_ptrs, footage_connections, cancelled);
   }
 }
 

app/project/item/footage/footage.cpp

@@ -40,48 +40,50 @@ Footage::~Footage()
 
 void Footage::Load(QXmlStreamReader *reader, QHash<quintptr, StreamPtr>& footage_ptrs, QList<NodeParam::FootageConnection>&, const QAtomicInt* cancelled)
 {
+  qDebug() << "Hello?";
+
   QXmlStreamAttributes attributes = reader->attributes();
 
   foreach (const QXmlStreamAttribute& attr, attributes) {
-    if (attr.name() == "name") {
+    if (attr.name() == QStringLiteral("name")) {
       set_name(attr.value().toString());
-    } else if (attr.name() == "filename") {
+    } else if (attr.name() == QStringLiteral("filename")) {
       set_filename(attr.value().toString());
     }
   }
 
   Decoder::ProbeMedia(this, cancelled);
 
-  XMLReadLoop(reader, "footage") {
+  while (XMLReadNextStartElement(reader)) {
     if (cancelled && *cancelled) {
       return;
     }
 
-    if (reader->isStartElement()) {
-      if (reader->name() == "stream") {
-        int stream_index = -1;
-        quintptr stream_ptr = 0;
+    if (reader->name() == QStringLiteral("stream")) {
+      int stream_index = -1;
+      quintptr stream_ptr = 0;
 
-        XMLAttributeLoop(reader, attr) {
-          if (cancelled && *cancelled) {
-            return;
-          }
-
-          if (attr.name() == "index") {
-            stream_index = attr.value().toInt();
-          } else if (attr.name() == "ptr") {
-            stream_ptr = attr.value().toULongLong();
-          }
+      XMLAttributeLoop(reader, attr) {
+        if (cancelled && *cancelled) {
+          return;
         }
 
-        if (stream_index > -1 && stream_ptr > 0) {
-          footage_ptrs.insert(stream_ptr, stream(stream_index));
-
-          stream(stream_index)->Load(reader);
-        } else {
-          qWarning() << "Invalid stream found in project file";
+        if (attr.name() == QStringLiteral("index")) {
+          stream_index = attr.value().toInt();
+        } else if (attr.name() == QStringLiteral("ptr")) {
+          stream_ptr = attr.value().toULongLong();
         }
       }
+
+      if (stream_index > -1 && stream_ptr > 0) {
+        footage_ptrs.insert(stream_ptr, stream(stream_index));
+
+        stream(stream_index)->Load(reader);
+      } else {
+        qWarning() << "Invalid stream found in project file";
+      }
+    } else {
+      reader->skipCurrentElement();
     }
   }
 }

app/project/item/footage/imagestream.cpp

@@ -43,10 +43,11 @@ void ImageStream::FootageSetEvent(Footage *f)
 
 void ImageStream::LoadCustomParameters(QXmlStreamReader *reader)
 {
-  XMLReadLoop(reader, "stream") {
-    if (reader->isStartElement() && reader->name() == "colorspace") {
-      reader->readNext();
-      set_colorspace(reader->text().toString());
+  while (XMLReadNextStartElement(reader)) {
+    if (reader->name() == QStringLiteral("colorspace")) {
+      set_colorspace(reader->readElementText());
+    } else {
+      reader->skipCurrentElement();
     }
   }
 }

app/project/item/footage/stream.cpp

@@ -151,8 +151,9 @@ void Stream::FootageSetEvent(Footage*)
 {
 }
 
-void Stream::LoadCustomParameters(QXmlStreamReader*)
+void Stream::LoadCustomParameters(QXmlStreamReader* reader)
 {
+  reader->skipCurrentElement();
 }
 
 void Stream::SaveCustomParameters(QXmlStreamWriter*) const

app/project/item/sequence/sequence.cpp

@@ -59,68 +59,63 @@ void Sequence::Load(QXmlStreamReader *reader, QHash<quintptr, StreamPtr> &, QLis
   QHash<quintptr, NodeOutput*> output_ptrs;
   QList<NodeParam::SerializedConnection> desired_connections;
 
-  XMLReadLoop(reader, "sequence") {
+  while (XMLReadNextStartElement(reader)) {
     if (cancelled && *cancelled) {
       return;
     }
 
-    if (reader->isStartElement()) {
-      if (reader->name() == "video") {
-        int video_width, video_height;
-        rational video_timebase;
+    if (reader->name() == QStringLiteral("video")) {
+      int video_width, video_height;
+      rational video_timebase;
 
-        XMLReadLoop(reader, "video") {
-          if (cancelled && *cancelled) {
-            return;
-          }
-
-          if (reader->isStartElement()) {
-            if (reader->name() == "width") {
-              reader->readNext();
-              video_width = reader->text().toInt();
-            } else if (reader->name() == "height") {
-              reader->readNext();
-              video_height = reader->text().toInt();
-            } else if (reader->name() == "timebase") {
-              reader->readNext();
-              video_timebase = rational::fromString(reader->text().toString());
-            }
-          }
+      while (XMLReadNextStartElement(reader)) {
+        if (cancelled && *cancelled) {
+          return;
         }
 
-        set_video_params(VideoParams(video_width, video_height, video_timebase));
-      } else if (reader->name() == "audio") {
-        int rate;
-        uint64_t layout;
-
-        XMLReadLoop(reader, "audio") {
-          if (reader->isStartElement()) {
-            if (reader->name() == "rate") {
-              reader->readNext();
-              rate = reader->text().toInt();
-            } else if (reader->name() == "layout") {
-              reader->readNext();
-              layout = reader->text().toULongLong();
-            }
-          }
-        }
-
-        set_audio_params(AudioParams(rate, layout));
-      } else if (reader->name() == "node" || reader->name() == "viewer") {
-        Node* node;
-
-        if (reader->name() == "node") {
-          node = XMLLoadNode(reader);
+        if (reader->name() == QStringLiteral("width")) {
+          video_width = reader->readElementText().toInt();
+        } else if (reader->name() == QStringLiteral("height")) {
+          video_height = reader->readElementText().toInt();
+        } else if (reader->name() == QStringLiteral("timebase")) {
+          video_timebase = rational::fromString(reader->readElementText());
         } else {
-          node = viewer_output_;
-        }
-
-        if (node) {
-          node->Load(reader, output_ptrs, desired_connections, footage_connections, cancelled, reader->name().toString());
-
-          AddNode(node);
+          reader->skipCurrentElement();
         }
       }
+
+      set_video_params(VideoParams(video_width, video_height, video_timebase));
+    } else if (reader->name() == QStringLiteral("audio")) {
+      int rate;
+      uint64_t layout;
+
+      while (XMLReadNextStartElement(reader)) {
+        if (reader->name() == QStringLiteral("rate")) {
+          rate = reader->readElementText().toInt();
+        } else if (reader->name() == QStringLiteral("layout")) {
+          layout = reader->readElementText().toULongLong();
+        } else {
+          reader->skipCurrentElement();
+        }
+      }
+
+      set_audio_params(AudioParams(rate, layout));
+    } else if (reader->name() == QStringLiteral("node") || reader->name() == QStringLiteral("viewer")) {
+      Node* node;
+
+      if (reader->name() == QStringLiteral("node")) {
+        node = XMLLoadNode(reader);
+      } else {
+        node = viewer_output_;
+      }
+
+      if (node) {
+        node->Load(reader, output_ptrs, desired_connections, footage_connections, cancelled);
+
+        AddNode(node);
+      }
+    } else {
+      reader->skipCurrentElement();
     }
   }
 

app/project/project.cpp

@@ -35,29 +35,32 @@ Project::Project()
 
 void Project::Load(QXmlStreamReader *reader, const QAtomicInt* cancelled)
 {
+  qDebug() << "Hello?";
+
   QHash<quintptr, StreamPtr> footage_ptrs;
   QList<NodeInput::FootageConnection> footage_connections;
 
-  XMLReadLoop(reader, "project") {
-    if (reader->isStartElement()) {
-      if (reader->name() == "folder") {
+  while (XMLReadNextStartElement(reader)) {
+    if (reader->name() == QStringLiteral("folder")) {
 
-        // Assume this folder is our root
-        root_.Load(reader, footage_ptrs, footage_connections, cancelled);
+      // Assume this folder is our root
+      root_.Load(reader, footage_ptrs, footage_connections, cancelled);
 
-      } else if (reader->name() == "colormanagement") {
+    } else if (reader->name() == QStringLiteral("colormanagement")) {
 
-        // Read color management info
-        XMLReadLoop(reader, "colormanagement") {
-          if (reader->name() == "config") {
-            reader->readNext();
-            set_ocio_config(reader->text().toString());
-          } else if (reader->name() == "default") {
-            reader->readNext();
-            set_default_input_colorspace(reader->text().toString());
-          }
+      // Read color management info
+      while (XMLReadNextStartElement(reader)) {
+        if (reader->name() == QStringLiteral("config")) {
+          set_ocio_config(reader->readElementText());
+        } else if (reader->name() == QStringLiteral("default")) {
+          set_default_input_colorspace(reader->readElementText());
+        } else {
+          reader->skipCurrentElement();
         }
       }
+
+    } else {
+      reader->skipCurrentElement();
     }
   }
 
@@ -97,7 +100,7 @@ QString Project::name() const
   if (filename_.isEmpty()) {
     return tr("(untitled)");
   } else {
-    return QFileInfo(filename_).baseName();
+    return QFileInfo(filename_).completeBaseName();
   }
 }
 

app/project/projectloadmanager.cpp

@@ -4,6 +4,8 @@
 #include <QFile>
 #include <QXmlStreamReader>
 
+#include "common/xmlutils.h"
+
 ProjectLoadManager::ProjectLoadManager(const QString &filename) :
   filename_(filename)
 {
@@ -17,28 +19,32 @@ void ProjectLoadManager::Action()
   if (project_file.open(QFile::ReadOnly | QFile::Text)) {
     QXmlStreamReader reader(&project_file);
 
-    while (!reader.atEnd()) {
-      reader.readNext();
+    qDebug() << "Hello?";
 
-      if (reader.isStartElement()) {
-        if (reader.name() == "version") {
-          reader.readNext();
+    while (XMLReadNextStartElement(&reader)) {
+      if (reader.name() == QStringLiteral("olive")) {
+        while(XMLReadNextStartElement(&reader)) {
+          if (reader.name() == QStringLiteral("version")) {
+            qDebug() << "Project version:" << reader.readElementText();
+          } else if (reader.name() == QStringLiteral("project")) {
+            ProjectPtr project = std::make_shared<Project>();
 
-          qDebug() << "Project version:" << reader.text();
-        } else if (reader.name() == "project") {
-          ProjectPtr project = std::make_shared<Project>();
+            project->set_filename(filename_);
 
-          project->set_filename(filename_);
+            project->Load(&reader, &IsCancelled());
 
-          project->Load(&reader, &IsCancelled());
+            // Ensure project is in main thread
+            moveToThread(qApp->thread());
 
-          // Ensure project is in main thread
-          moveToThread(qApp->thread());
-
-          if (!IsCancelled()) {
-            emit ProjectLoaded(project);
+            if (!IsCancelled()) {
+              emit ProjectLoaded(project);
+            }
+          } else {
+            reader.skipCurrentElement();
           }
         }
+      } else {
+        reader.skipCurrentElement();
       }
     }