MimeInfoEditor::getMimeTypeIconNames

Author: azubieta

src/libappimage/desktop_integration/integrator/MimeInfoEditor.cpp

@@ -1,8 +1,8 @@
 // libraries
 #include <boost/property_tree/xml_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
+#include <appimage_handler.h>
 
 // local
 #include "utils/Logger.h"
@@ -11,18 +11,21 @@
 namespace appimage {
     namespace desktop_integration {
         namespace integrator {
-            MimeInfoEditor::MimeInfoEditor(std::string data, std::string deployId)
-                : data(std::move(data)), deployId(std::move(deployId)) {}
-
-            std::string MimeInfoEditor::edit() {
-                std::stringstream in(data), out;
-
+            MimeInfoEditor::MimeInfoEditor(std::string data) {
                 try {
+                    std::stringstream in(data);
                     using boost::property_tree::ptree;
 
                     // populate tree structure pt
-                    ptree pt;
                     read_xml(in, pt);
+                } catch (const std::runtime_error& error) {
+                    appimage::utils::Logger::warning(std::string("Unable to read MimeInfo: ") + error.what());
+                }
+            }
+
+            std::string MimeInfoEditor::edit() {
+                try {
+                    using boost::property_tree::ptree;
 
                     // traverse pt
                     for (auto& node:  pt.get_child("mime-info")) {
@@ -43,13 +46,46 @@ namespace appimage {
                         }
                     }
 
+                    std::stringstream out;
                     write_xml(out, pt);
+                    return out.str();
                 } catch (const std::runtime_error& error) {
                     appimage::utils::Logger::warning(std::string("Unable to edit MimeInfo: ") + error.what());
-                    return data;
+                    return std::string{};
+                }
+            }
+
+            void MimeInfoEditor::setDeployId(const std::string& deployId) {
+                MimeInfoEditor::deployId = deployId;
+            }
+
+            std::list<std::string> MimeInfoEditor::getMimeTypeIconNames() {
+                std::list<std::string> icons;
+
+                try {
+                    using boost::property_tree::ptree;
+
+                    // traverse pt
+                    for (auto& node:  pt.get_child("mime-info")) {
+                        if (node.first == "mime-type") {
+                            auto& subTree = node.second;
+                            // get original icon name from the icon entry
+                            std::string iconName = subTree.get<std::string>("icon.<xmlattr>.name", "");
+
+                            // or fallback to the mime-type name
+                            if (iconName.empty()) {
+                                iconName = subTree.get<std::string>("<xmlattr>.type");
+                                boost::replace_all(iconName, "/", "-");
+                            }
+
+                            icons.push_back(iconName);
+                        }
+                    }
+                } catch (const std::runtime_error& error) {
+                    appimage::utils::Logger::warning(std::string("Unable to read MimeInfo: ") + error.what());
                 }
 
-                return out.str();
+                return icons;
             }
         }
     }

src/libappimage/desktop_integration/integrator/MimeInfoEditor.h

@@ -1,8 +1,12 @@
 #pragma once
 
 // system
+#include <list>
 #include <string>
 
+// libraries
+#include <boost/property_tree/ptree.hpp>
+
 namespace appimage {
     namespace desktop_integration {
         namespace integrator {
@@ -18,12 +22,16 @@ namespace appimage {
                  * @param data
                  * @param deployId
                  */
-                MimeInfoEditor(std::string data, std::string deployId);
+                MimeInfoEditor(std::string data);
+
+                void setDeployId(const std::string& deployId);
 
                 std::string edit();
 
+                std::list<std::string> getMimeTypeIconNames();
+
             private:
-                std::string data;
+                boost::property_tree::ptree pt;
                 std::string deployId;
             };
         }

tests/libappimage/desktop_integration/integrator/TestMimeInfoEditor.cpp

@@ -57,7 +57,8 @@ class MimeInfoEditorTests : public ::testing::Test {
 };
 
 TEST_F(MimeInfoEditorTests, setIcon) {
-    MimeInfoEditor editor(mimeInfo.str(), "appimaged-d41d8cd98f00b204e9800998ecf8427e");
+    MimeInfoEditor editor(mimeInfo.str());
+    editor.setDeployId("appimaged-d41d8cd98f00b204e9800998ecf8427e");
     std::string result = editor.edit();
 
 
@@ -75,7 +76,8 @@ TEST_F(MimeInfoEditorTests, setIcon) {
 }
 
 TEST_F(MimeInfoEditorTests, updateIcon) {
-    MimeInfoEditor editor(mimeInfoWithIconEntry.str(), "appimaged-d41d8cd98f00b204e9800998ecf8427e");
+    MimeInfoEditor editor(mimeInfoWithIconEntry.str());
+    editor.setDeployId("appimaged-d41d8cd98f00b204e9800998ecf8427e");
     std::string result = editor.edit();
 
 
@@ -91,3 +93,19 @@ TEST_F(MimeInfoEditorTests, updateIcon) {
 
     ASSERT_EQ(resultPt, expectedPt);
 }
+
+TEST_F(MimeInfoEditorTests, getIconNamesFromMimeTypeType) {
+    MimeInfoEditor editor(mimeInfo.str());
+    std::list<std::string> iconNames = editor.getMimeTypeIconNames();
+    std::list<std::string> expectedIconNames = {"application-x-starbright-file"};
+
+    ASSERT_EQ(iconNames, expectedIconNames);
+}
+
+TEST_F(MimeInfoEditorTests, getIconNamesFromMimeTypeIconName) {
+    MimeInfoEditor editor(mimeInfoWithIconEntry.str());
+    std::list<std::string> iconNames = editor.getMimeTypeIconNames();
+    std::list<std::string> expectedIconNames = {"application-x-starbright-file"};
+
+    ASSERT_EQ(iconNames, expectedIconNames);
+}