Allow groups with name=".." in extra settings

Allow storing of children in a current branch without creation of new named sub-branch
WohlSoft · Jan 6, 2020 · 09b494d · 09b494d
1 parent e3a3679
commit 09b494d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/LunaDll/FileManager/config_manager.cpp b/LunaDll/FileManager/config_manager.cpp
@@ -515,21 +515,35 @@ static void read_layout_branches(nlohmann::json &typetree,
     for(auto it = src.begin(); it != src.end(); it++)
     {
         nlohmann::json &entry = *it;
+        std::string name;
+        std::string control;
+
         if(entry.find("control") == entry.end())
-            continue; // invalid entry: missing required key
-        if(entry.find("name") == entry.end())
-            continue; // invalid entry: missing required key
+            control = "invalid";
+        else
+            control = entry["control"];
 
-        std::string control = entry["control"];
-        std::string name = entry["name"];
+        if(entry.find("name") == entry.end())
+            name = control;
+        else
+            name = entry["name"];
 
         if(SDL_strncasecmp(control.c_str(), "group", 6) == 0)
         {
             if(entry.find("children") == entry.end())
                 continue; // Invalid entry: missing a required key
             nlohmann::json path_arr_next = path_arr;
-            path_arr_next.push_back(name);
-            read_layout_branches(typetree, dst[name], entry["children"], path_arr_next);
+            if(name != "..")
+            {
+                // Create a new named branch and store all children inside
+                path_arr_next.push_back(name);
+                read_layout_branches(typetree, dst[name], entry["children"], path_arr_next);
+            }
+            else
+            {
+                // Store all children in a current branch
+                read_layout_branches(typetree, dst, entry["children"], path_arr_next);
+            }
         }
         else if(SDL_strncasecmp(control.c_str(), "spinbox", 8) == 0)
         {

diff --git a/test/extra-settings/lles-test.cpp b/test/extra-settings/lles-test.cpp
@@ -23,7 +23,10 @@ static const char *test_str1 =
 "   \"whereIsMySombrero\": {"
 "       \"x\": 9,"
 "       \"y\": 12"
-"   }"
+"   },"
+"\"zzzzzzzzzzzzzzzzzzzzzzzz1\": 28,"
+"\"zzzzzzzzzzzzzzzzzzzzzzzz2\": \"22r`2`r2r``2r\","
+"\"zzzzzzzzzzzzzzzzzzzzzzzz3\": \"popa\""
 "}";
 
 static const char *test_str2 =