Add Array Subscript Operator to DesktopEntry

Author: Alexis Lopez Zubieta

include/XdgUtils/DesktopEntry/DesktopEntry.h

@@ -8,6 +8,8 @@
 
 // local
 #include <XdgUtils/DesktopEntry/Exceptions.h>
+#include <XdgUtils/DesktopEntry/DesktopEntryKeyPath.h>
+#include <XdgUtils/DesktopEntry/DesktopEntryKeyValue.h>
 
 namespace XdgUtils {
     namespace DesktopEntry {
@@ -77,6 +79,20 @@ namespace XdgUtils {
             friend std::ostream& operator<<(std::ostream& os, const DesktopEntry& entry);
 
 
+            /**
+             * Access the key pointed by <keyPath> if it doesn't exist a new one will be created.
+             * @param keyPath
+             * @return
+             */
+            DesktopEntryKeyValue operator[](const DesktopEntryKeyPath& keyPath);
+
+            /**
+             * Access the key pointed by <keyPath> if it doesn't exist a new one will be created.
+             * @param keyPath
+             * @return
+             */
+            DesktopEntryKeyValue operator[](const std::string& keyPath);
+
             bool operator==(const DesktopEntry& rhs) const;
 
             bool operator!=(const DesktopEntry& rhs) const;

src/DesktopEntry/AST/Group.cpp

@@ -22,7 +22,7 @@ namespace XdgUtils {
 
                 auto pos = headerRawValue.find(headerValue);
 
-                headerRawValue.replace(pos, std::string::npos, newValue);
+                headerRawValue = '[' + newValue + ']';
                 headerValue = newValue;
             }
 

src/DesktopEntry/DesktopEntry.cpp

@@ -11,6 +11,7 @@
 #include "Reader/Tokenizer.h"
 #include "Reader/Reader.h"
 #include "Reader/Errors.h"
+#include "DesktopEntryKeyValuePriv.h"
 
 namespace XdgUtils {
     namespace DesktopEntry {
@@ -65,6 +66,11 @@ namespace XdgUtils {
 
             void createEntry(const DesktopEntryKeyPath& keyPath, const std::string& value) {
                 auto group = std::dynamic_pointer_cast<AST::Group>(paths[keyPath.group()]);
+                // create group if it doesn't exists
+                if (!group) {
+                    createGroup(keyPath.group());
+                    group = std::dynamic_pointer_cast<AST::Group>(paths[keyPath.group()]);
+                }
 
                 // append entry to group
                 auto entry = std::make_shared<AST::Entry>(keyPath.key(), keyPath.locale(), value);
@@ -75,20 +81,6 @@ namespace XdgUtils {
                 paths[keyPath.string()] = entry;
             }
 
-            std::string createEntryPath(const std::string& groupName, const AST::Entry& entry) {
-                std::stringstream path;
-
-                if (!groupName.empty())
-                    path << groupName << '/';
-
-                path << entry.getKey();
-
-                if (!entry.getLocale().empty())
-                    path << '[' << entry.getLocale() << ']';
-
-                return path.str();
-            }
-
             void removeGroup(const std::string& groupName) {
                 auto g = paths[groupName];
 
@@ -128,6 +120,18 @@ namespace XdgUtils {
                     paths.erase(path);
                 }
             }
+
+            std::shared_ptr<AST::Node> getOrCreateEntry(const DesktopEntryKeyPath& keyPath) {
+                auto itr = paths.find(keyPath.string());
+                if (itr == paths.end()) {
+                    if (keyPath.key().empty())
+                        createGroup(keyPath.group());
+                    else
+                        createEntry(keyPath, "");
+                }
+
+                return paths[keyPath.string()];
+            }
         };
 
         DesktopEntry::DesktopEntry() : priv(new Priv) {}
@@ -215,6 +219,16 @@ namespace XdgUtils {
         bool DesktopEntry::operator!=(const DesktopEntry& rhs) const {
             return !(rhs == *this);
         }
+
+        DesktopEntryKeyValue DesktopEntry::operator[](const DesktopEntryKeyPath& keyPath) {
+            auto entry = priv->getOrCreateEntry(keyPath);
+
+            return DesktopEntryKeyValue(new DesktopEntryKeyValue::Priv(keyPath, entry));
+        }
+
+        DesktopEntryKeyValue DesktopEntry::operator[](const std::string& keyPath) {
+            return operator[](DesktopEntryKeyPath(keyPath));
+        }
     }
 
 }

tests/DesktopEntry/TestDesktopEntry.cpp

@@ -199,3 +199,27 @@ TEST_F(TestDesktopEntry, removeEntry) {
 
     ASSERT_EQ(out.str(), "[G1]\nName=1\n[g2]\nName=2\n");
 }
+
+TEST_F(TestDesktopEntry, arraySubscriptOperatorAccessGroup) {
+    DesktopEntry::DesktopEntry entry;
+
+    entry["Group"] = "Group";
+
+    std::stringstream out;
+    out << entry;
+
+    ASSERT_EQ(out.str(), "[Group]\n");
+}
+
+TEST_F(TestDesktopEntry, arraySubscriptOperatorAccessEntry) {
+    DesktopEntry::DesktopEntry entry;
+    entry["Group/Key"] = "My App";
+
+    ASSERT_EQ(static_cast<std::string>(entry["Group/Key"]), "My App");
+
+    std::stringstream out;
+    out << entry;
+
+    ASSERT_EQ(out.str(), "[Group]\n"
+                         "Key=My App");
+}