Merge lp:~3v1n0/unity/desktop-utilities-unescape-paths-6.0 into lp:unity/6.0

[Marco Trevisan (Treviño)]

DesktopUtilities: unescape the desktop paths and ids before processing them

Backporting branch lp:~3v1n0/unity/desktop-utilities-unescape-paths/+merge/127590 to unity 6.0

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'UnityCore/DesktopUtilities.cpp'
--- UnityCore/DesktopUtilities.cpp	2012-09-07 14:32:44 +0000
+++ UnityCore/DesktopUtilities.cpp	2012-10-02 21:05:04 +0000
@@ -87,6 +87,12 @@
   if (desktop_path.empty())
     return "";
 
+  glib::String unescaped(g_uri_unescape_string(desktop_path.c_str(), NULL));
+  std::string const& desktop_file = unescaped.Str();
+
+  if (desktop_file.empty())
+    return "";
+
   for (auto dir : default_paths)
   {
     if (!dir.empty())
@@ -100,11 +106,11 @@
         dir.append(G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S);
       }
 
-      if (desktop_path.find(dir) == 0)
+      if (desktop_file.find(dir) == 0)
       {
         // if we are in a subdirectory of system path, the store name should
         // be subdir-filename.desktop
-        std::string desktop_suffix = desktop_path.substr(dir.size());
+        std::string desktop_suffix = desktop_file.substr(dir.size());
         std::replace(desktop_suffix.begin(), desktop_suffix.end(), G_DIR_SEPARATOR, '-');
 
         return desktop_suffix;
@@ -112,7 +118,7 @@
     }
   }
 
-  return desktop_path;
+  return desktop_file;
 }
 
 std::string DesktopUtilities::GetDesktopID(std::string const& desktop_path)
@@ -126,12 +132,18 @@
   if (desktop_id.empty())
     return "";
 
+  glib::String unescaped_id(g_uri_unescape_string(desktop_id.c_str(), NULL));
+  std::string const& id = unescaped_id.Str();
+
+  if (id.empty())
+    return "";
+
   glib::Object<GDesktopAppInfo> info;
 
-  if (desktop_id.find(G_DIR_SEPARATOR_S) != std::string::npos)
-    info = g_desktop_app_info_new_from_filename(desktop_id.c_str());
+  if (id.find(G_DIR_SEPARATOR_S) != std::string::npos)
+    info = g_desktop_app_info_new_from_filename(id.c_str());
   else
-    info = g_desktop_app_info_new(desktop_id.c_str());
+    info = g_desktop_app_info_new(id.c_str());
 
   if (info)
   {

=== modified file 'tests/test_desktop_utilities.cpp'
--- tests/test_desktop_utilities.cpp	2012-09-18 15:47:49 +0000
+++ tests/test_desktop_utilities.cpp	2012-10-02 21:05:04 +0000
@@ -36,9 +36,6 @@
 TEST(TestDesktopUtilitiesDesktopID, TestEmptyValues)
 {
   std::vector<std::string> empty_list;
-
-  EXPECT_THAT(DesktopUtilities::GetDesktopID(empty_list, "/some/path/to.desktop"),
-              Eq("/some/path/to.desktop"));
   EXPECT_THAT(DesktopUtilities::GetDesktopID(empty_list, "/some/path/to.desktop"),
               Eq("/some/path/to.desktop"));
 
@@ -77,6 +74,21 @@
               Eq("/some/path/applications/to.desktop"));
 }
 
+TEST(TestDesktopUtilitiesDesktopID, TestUnescapePath)
+{
+  std::vector<std::string> dirs;
+
+  dirs.push_back("/this/ path");
+  dirs.push_back("/that/path /");
+
+  EXPECT_THAT(DesktopUtilities::GetDesktopID(dirs, "/this/%20path/applications/to%20file.desktop"),
+              Eq("to file.desktop"));
+  EXPECT_THAT(DesktopUtilities::GetDesktopID(dirs, "/that/path%20/applications/to%20file.desktop"),
+              Eq("to file.desktop"));
+  EXPECT_THAT(DesktopUtilities::GetDesktopID(dirs, "/some/path/applications/to%20file.desktop"),
+              Eq("/some/path/applications/to file.desktop"));
+}
+
 TEST(TestDesktopUtilitiesDesktopID, TestSubdirectory)
 {
   std::vector<std::string> dirs;