libcore|Info: Converting an Info block to a Record

skyjake · Nov 5, 2018 · 093c0e6 · 093c0e6
1 parent 3f90377
commit 093c0e6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/doomsday/sdk/libcore/include/de/data/info.h b/doomsday/sdk/libcore/include/de/data/info.h
@@ -20,9 +20,10 @@
 #ifndef LIBDENG2_INFO_H
 #define LIBDENG2_INFO_H
 
-#include "../String"
 #include "../NativePath"
+#include "../Record"
 #include "../SourceLineTable"
+#include "../String"
 
 #include <QStringList>
 #include <QHash>
@@ -246,6 +247,12 @@ class DENG2_PUBLIC Info
          */
         void moveContents(BlockElement &destination);
 
+        /**
+         * Converts the contents of the block into a Record.
+         * @return Record with block elements.
+         */
+        Record asRecord() const;
+
     private:
         Info &_info;
         String _blockType;

diff --git a/doomsday/sdk/libcore/src/data/info.cpp b/doomsday/sdk/libcore/src/data/info.cpp
@@ -22,8 +22,10 @@
 #include "de/Folder"
 #include "de/Log"
 #include "de/LogBuffer"
+#include "de/RecordValue"
 #include "de/ScriptLex"
 #include "de/SourceLineTable"
+#include <de/TextValue>
 
 #include <QFile>
 
@@ -806,6 +808,35 @@ void Info::BlockElement::moveContents(BlockElement &destination)
     _contents.clear();
 }
 
+Record Info::BlockElement::asRecord() const
+{
+    Record rec;
+    for (auto i = _contents.begin(); i != _contents.end(); ++i)
+    {
+        std::unique_ptr<Variable> var(new Variable(i.key()));
+        const Element *elem = i.value();
+        if (elem->isBlock())
+        {
+            var->set(RecordValue::takeRecord(elem->as<BlockElement>().asRecord()));
+        }
+        else if (elem->isList())
+        {
+            std::unique_ptr<ArrayValue> array(new ArrayValue);
+            for (const auto &value : elem->values())
+            {
+                array->add(new TextValue(value.text));
+            }
+            var->set(array.release());
+        }
+        else
+        {
+            var->set(new TextValue(elem->as<KeyElement>().value().text));
+        }
+        rec.add(var.release());
+    }
+    return rec;
+}
+
 //---------------------------------------------------------------------------------------
 
 Info::Info() : d(new Impl(this))

diff --git a/doomsday/sdk/libcore/src/data/record.cpp b/doomsday/sdk/libcore/src/data/record.cpp
@@ -1155,7 +1155,7 @@ String Record::asInfo() const
     os.setCodec("UTF-8");
     for (auto i = d->members.constBegin(); i != d->members.constEnd(); ++i)
     {
-        Variable const &var = *i.value();
+        const Variable &var = *i.value();
         String src = i.key();
 
         if (is<RecordValue>(var.value()))