Merge lp:~larryprice/ubuntu-app-launch/recursive-desktop-files into lp:ubuntu-app-launch/16.10

[Larry Price]

Recursively sweep for desktop files for libertine and legacy applications.

Recursively sweep for desktop files for libertine and legacy applications.

Goes hand-in-hand with an update to liblibertine which finds desktop files recursively https://code.launchpad.net/~larryprice/libertine/recurse-apps-dir.

[Ted Gould (ted)]

So I think this branch is gonna break when it gets merged with:

https://code.launchpad.net/~ted/ubuntu-app-launch/snappy-backend-no-snap/+merge/302025

As it removes the app-info.h file. The goal generally is to have that C code go away and be replaced with C++ code. I think that will restructure things a bunch. Also you forgot to include test-nested.desktop.

review: Needs Fixing

[lp:~larryprice/ubuntu-app-launch/recursive-desktop-files]

236. By Larry Price on 2016-08-10

adding nested

Unmerged revisions

236. By Larry Price on 2016-08-10

adding nested

235. By Larry Price on 2016-08-03

Quick tests to verify nested keyfiles are now being accepted

234. By Larry Price on 2016-08-03

moving keyfileFromPath to parent to reduce code dup

233. By Larry Price on 2016-08-03

Same treatment for legacy apps

232. By Larry Price on 2016-08-03

Updating Libertine ctor to find correct desktop file

231. By Larry Price on 2016-08-03

updating app-info to recursively find legacy apps

=== modified file 'libubuntu-app-launch/app-info.c'
--- libubuntu-app-launch/app-info.c	2015-08-12 02:52:05 +0000
+++ libubuntu-app-launch/app-info.c	2016-08-04 14:10:59 +0000
@@ -200,27 +200,67 @@
 	}
 }
 
-/* Look to see if the app id results in a desktop file, if so, fill in the params */
 static gboolean
-evaluate_dir (const gchar * dir, const gchar * desktop, gchar ** appdir, gchar ** appdesktop)
-{
-	char * fulldir = g_build_filename(dir, "applications", desktop, NULL);
-	gboolean found = FALSE;
-
-	if (g_file_test(fulldir, G_FILE_TEST_EXISTS)) {
-		if (appdir != NULL) {
-			*appdir = g_strdup(dir);
-		}
-
-		if (appdesktop != NULL) {
-			*appdesktop = g_strdup_printf("applications/%s", desktop);
-		}
-
-		found = TRUE;
-	}
-
-	g_free(fulldir);
-	return found;
+find_desktop_file (const gchar * base_path, const gchar * rel_path, const gchar * desktop_file, gchar ** appdesktop)
+{
+  gchar* full_path = g_build_filename(base_path, rel_path, NULL);
+  gchar* full_filename = g_build_filename(full_path, desktop_file, NULL);
+
+  if (g_file_test(full_filename, G_FILE_TEST_IS_REGULAR)) {
+    if (appdesktop != NULL) {
+      *appdesktop = g_build_filename(rel_path, desktop_file, NULL);
+    }
+
+    g_free(full_filename);
+    g_free(full_path);
+    return TRUE;
+  }
+  g_free(full_filename);
+
+  GError* error = NULL;
+  GDir* dir = g_dir_open(full_path, 0, &error);
+  if (error != NULL) {
+    g_error_free(error);
+    g_free(full_path);
+    return FALSE;
+  }
+
+  const gchar* files;
+  while ((files = g_dir_read_name(dir)) != NULL)
+  {
+    gchar* file = g_build_filename(full_path, files, NULL);
+    if (g_file_test(file, G_FILE_TEST_IS_DIR))
+    {
+      gchar* file_rel_path = g_build_filename(rel_path, files, NULL);
+      if (find_desktop_file(base_path, file_rel_path, desktop_file, appdesktop))
+      {
+        g_free(file_rel_path);
+        g_free(file);
+        g_free(dir);
+        g_free(full_path);
+        return TRUE;
+      }
+      g_free(file_rel_path);
+    }
+    g_free(file);
+  }
+
+  g_free(dir);
+  g_free(full_path);
+
+  return FALSE;
+}
+
+gboolean
+find_app_info (const gchar * base_path, const gchar * desktop_file, gchar ** appdir, gchar ** appdesktop)
+{
+  if (find_desktop_file(base_path, "applications", desktop_file, appdesktop)) {
+    if (appdir != NULL) {
+      *appdir = g_strdup(base_path);
+    }
+    return TRUE;
+  }
+  return FALSE;
 }
 
 /* Handle the legacy case where we look through the data directories */
@@ -228,22 +268,20 @@
 app_info_legacy (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
 {
 	gchar * desktop = g_strdup_printf("%s.desktop", appid);
-
-	/* Special case the user's dir */
-	if (evaluate_dir(g_get_user_data_dir(), desktop, appdir, appdesktop)) {
-		g_free(desktop);
-		return TRUE;
-	}
-
-	const char * const * data_dirs = g_get_system_data_dirs();
-	int i;
-	for (i = 0; data_dirs[i] != NULL; i++) {
-		if (evaluate_dir(data_dirs[i], desktop, appdir, appdesktop)) {
-			g_free(desktop);
+  if (find_app_info(g_get_user_data_dir(), desktop, appdir, appdesktop)) {
+    g_free(desktop);
+    return TRUE;
+  }
+
+  const char * const * data_dirs = g_get_system_data_dirs();
+  for (int i = 0; data_dirs[i] != NULL; i++) {
+    if (find_app_info(data_dirs[i], desktop, appdir, appdesktop)) {
+      g_free(desktop);
 			return TRUE;
-		}
+    }
 	}
 
+  g_free(desktop);
 	return FALSE;
 }
 
@@ -259,45 +297,29 @@
 	}
 
 	gchar * desktopname = g_strdup_printf("%s.desktop", app);
-
-	gchar * desktopdir = g_build_filename(g_get_user_cache_dir(), "libertine-container", container, "rootfs", "usr", "share", NULL);
-	gchar * desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
-
-	if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
-		g_free(desktopdir);
-		g_free(desktopfile);
-
-		desktopdir = g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container, ".local", "share", NULL);
-		desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
-
-		if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
-			g_free(desktopdir);
-			g_free(desktopfile);
-
-			g_free(desktopname);
-			g_free(container);
-			g_free(app);
-
-			return FALSE;
-		}
-	}
-
-	if (appdir != NULL) {
-		*appdir = desktopdir;
-	} else {
-		g_free(desktopdir);
-	}
-
-	if (appdesktop != NULL) {
-		*appdesktop = g_build_filename("applications", desktopname, NULL);
-	}
-
-	g_free(desktopfile);
-	g_free(desktopname);
-	g_free(container);
-	g_free(app);
-
-	return TRUE;
+  g_free(app);
+
+  gchar * system_dir = g_build_filename(g_get_user_cache_dir(), "libertine-container", container, "rootfs", "usr", "share", NULL);
+  if (find_app_info(system_dir, desktopname, appdir, appdesktop)) {
+    g_free(system_dir);
+    g_free(desktopname);
+    g_free(container);
+    return TRUE;
+  }
+  g_free(system_dir);
+
+  gchar * user_dir = g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container, ".local", "share", NULL);
+  if (find_app_info(user_dir, desktopname, appdir, appdesktop)) {
+    g_free(user_dir);
+    g_free(desktopname);
+    g_free(container);
+    return TRUE;
+  }
+  g_free(user_dir);
+  g_free(desktopname);
+  g_free(container);
+
+  return FALSE;
 }
 
 /* Get the information on where the desktop file is from libclick */
 
=== modified file 'libubuntu-app-launch/application-impl-base.cpp'
--- libubuntu-app-launch/application-impl-base.cpp	2016-02-09 22:12:32 +0000
+++ libubuntu-app-launch/application-impl-base.cpp	2016-08-04 14:10:59 +0000
@@ -157,6 +157,32 @@
     return std::make_shared<BaseInstance>(appIdStr);
 }
 
+std::shared_ptr<GKeyFile> Base::keyfileFromPath(const gchar* pathname)
+{
+    if (!g_file_test(pathname, G_FILE_TEST_EXISTS))
+    {
+        return {};
+    }
+
+    std::shared_ptr<GKeyFile> keyfile(g_key_file_new(), [](GKeyFile* keyfile) {
+        if (keyfile != nullptr)
+        {
+            g_key_file_free(keyfile);
+        }
+    });
+    GError* error = nullptr;
+
+    g_key_file_load_from_file(keyfile.get(), pathname, G_KEY_FILE_NONE, &error);
+
+    if (error != nullptr)
+    {
+        g_error_free(error);
+        return {};
+    }
+
+    return keyfile;
+}
+
 };  // namespace app_impls
 };  // namespace app_launch
 };  // namespace ubuntu
 
=== modified file 'libubuntu-app-launch/application-impl-base.h'
--- libubuntu-app-launch/application-impl-base.h	2016-02-09 22:12:32 +0000
+++ libubuntu-app-launch/application-impl-base.h	2016-08-04 14:10:59 +0000
@@ -45,6 +45,8 @@
 
 protected:
     std::shared_ptr<Registry> _registry;
+
+    static std::shared_ptr<GKeyFile> keyfileFromPath(const gchar* pathname);
 };
 
 };  // namespace app_impls
 
=== modified file 'libubuntu-app-launch/application-impl-legacy.cpp'
--- libubuntu-app-launch/application-impl-legacy.cpp	2016-05-02 13:59:09 +0000
+++ libubuntu-app-launch/application-impl-legacy.cpp	2016-08-04 14:10:59 +0000
@@ -19,6 +19,10 @@
 
 #include "application-impl-legacy.h"
 #include "application-info-desktop.h"
+extern "C"
+{
+#include "app-info.h"
+}
 
 namespace ubuntu
 {
@@ -27,77 +31,29 @@
 namespace app_impls
 {
 
-std::pair<std::string, std::shared_ptr<GKeyFile>> keyfileForApp(const AppID::AppName& name);
-
-void clear_keyfile(GKeyFile* keyfile)
-{
-    if (keyfile != nullptr)
-    {
-        g_key_file_free(keyfile);
-    }
-}
-
-Legacy::Legacy(const AppID::AppName& appname,
-               const std::string& basedir,
-               const std::shared_ptr<GKeyFile>& keyfile,
-               const std::shared_ptr<Registry>& registry)
-    : Base(registry)
-    , _appname(appname)
-    , _basedir(basedir)
-    , _keyfile(keyfile)
-{
-    if (!_keyfile)
-        throw std::runtime_error{"Unable to find keyfile for legacy application: " + appname.value()};
-}
-
 Legacy::Legacy(const AppID::AppName& appname, const std::shared_ptr<Registry>& registry)
     : Base(registry)
     , _appname(appname)
 {
-    std::tie(_basedir, _keyfile) = keyfileForApp(appname);
+    gchar* basedir = NULL;
+    gchar* keyfile = NULL;
+    if (!app_info_legacy(appname.value().c_str(), &basedir, &keyfile))
+    {
+        throw std::runtime_error{"Unable to find keyfile for legacy application: " + appname.value()};
+    }
+
+    _basedir = basedir;
+    gchar* full_filename = g_build_filename(basedir, keyfile, nullptr);
+    _keyfile = keyfileFromPath(full_filename);
+
+    g_free(full_filename);
+    g_free(keyfile);
+    g_free(basedir);
 
     if (!_keyfile)
+    {
         throw std::runtime_error{"Unable to find keyfile for legacy application: " + appname.value()};
-}
-
-std::pair<std::string, std::shared_ptr<GKeyFile>> keyfileForApp(const AppID::AppName& name)
-{
-    std::string desktopName = name.value() + ".desktop";
-    auto keyfilecheck = [desktopName](const std::string& dir) -> std::shared_ptr<GKeyFile> {
-        auto fullname = g_build_filename(dir.c_str(), "applications", desktopName.c_str(), nullptr);
-        if (!g_file_test(fullname, G_FILE_TEST_EXISTS))
-        {
-            g_free(fullname);
-            return {};
-        }
-
-        auto keyfile = std::shared_ptr<GKeyFile>(g_key_file_new(), clear_keyfile);
-
-        GError* error = nullptr;
-        g_key_file_load_from_file(keyfile.get(), fullname, G_KEY_FILE_NONE, &error);
-        g_free(fullname);
-
-        if (error != nullptr)
-        {
-            g_debug("Unable to load keyfile '%s' becuase: %s", desktopName.c_str(), error->message);
-            g_error_free(error);
-            return {};
-        }
-
-        return keyfile;
-    };
-
-    std::string basedir = g_get_user_data_dir();
-    auto retval = keyfilecheck(basedir);
-
-    auto systemDirs = g_get_system_data_dirs();
-    for (auto i = 0; !retval && systemDirs[i] != nullptr; i++)
-    {
-        basedir = systemDirs[i];
-        retval = keyfilecheck(basedir);
     }
-
-    return std::make_pair(basedir, retval);
 }
 
 std::shared_ptr<Application::Info> Legacy::info()
 
=== modified file 'libubuntu-app-launch/application-impl-legacy.h'
--- libubuntu-app-launch/application-impl-legacy.h	2016-05-02 13:47:11 +0000
+++ libubuntu-app-launch/application-impl-legacy.h	2016-08-04 14:10:59 +0000
@@ -34,10 +34,6 @@
 {
 public:
     Legacy(const AppID::AppName& appname, const std::shared_ptr<Registry>& registry);
-    Legacy(const AppID::AppName& appname,
-           const std::string& basedir,
-           const std::shared_ptr<GKeyFile>& keyfile,
-           const std::shared_ptr<Registry>& registry);
 
     AppID appId() override
     {
 
=== modified file 'libubuntu-app-launch/application-impl-libertine.cpp'
--- libubuntu-app-launch/application-impl-libertine.cpp	2016-05-02 15:16:29 +0000
+++ libubuntu-app-launch/application-impl-libertine.cpp	2016-08-04 14:10:59 +0000
@@ -19,7 +19,11 @@
 
 #include "application-impl-libertine.h"
 #include "application-info-desktop.h"
-#include "libertine.h"
+extern "C"
+{
+#include "app-info.h"
+}
+#include <libertine.h>
 
 namespace ubuntu
 {
@@ -28,8 +32,6 @@
 namespace app_impls
 {
 
-std::shared_ptr<GKeyFile> keyfileFromPath(const gchar* pathname);
-
 Libertine::Libertine(const AppID::Package& container,
                      const AppID::AppName& appname,
                      const std::shared_ptr<Registry>& registry)
@@ -37,73 +39,26 @@
     , _container(container)
     , _appname(appname)
 {
-    if (!_keyfile)
-    {
-        auto container_path = libertine_container_path(container.value().c_str());
-        auto container_app_path = g_build_filename(container_path, "usr", "share", "applications",
-                                                   (appname.value() + ".desktop").c_str(), nullptr);
-
-        _keyfile = keyfileFromPath(container_app_path);
-
-        if (_keyfile)
-        {
-            auto gbasedir = g_build_filename(container_path, "usr", "share", nullptr);
-            _basedir = gbasedir;
-            g_free(gbasedir);
-        }
-
-        g_free(container_app_path);
-        g_free(container_path);
-    }
-
-    if (!_keyfile)
-    {
-        auto home_path = libertine_container_home_path(container.value().c_str());
-        auto home_app_path = g_build_filename(home_path, ".local", "share", "applications",
-                                              (appname.value() + ".desktop").c_str(), NULL);
-
-        _keyfile = keyfileFromPath(home_app_path);
-
-        if (_keyfile)
-        {
-            auto gbasedir = g_build_filename(home_path, ".local", "share", nullptr);
-            _basedir = gbasedir;
-            g_free(gbasedir);
-        }
-
-        g_free(home_app_path);
-        g_free(home_path);
-    }
-
-    if (!_keyfile)
+    gchar* basedir = NULL;
+    gchar* keyfile = NULL;
+    if (!app_info_libertine(ubuntu_app_launch_triplet_to_app_id(container.value().c_str(), appname.value().c_str(), "0.0"), &basedir, &keyfile))
+    {
+      throw std::runtime_error{"Unable to find a keyfile for application '" + appname.value() + "' in container '" +
+                               container.value() + "'"};
+    }
+    _basedir = basedir;
+    gchar* full_filename = g_build_filename(basedir, keyfile, nullptr);
+    _keyfile = keyfileFromPath(full_filename);
+
+    g_free(full_filename);
+    g_free(keyfile);
+    g_free(basedir);
+
+    if (!_keyfile)
+    {
         throw std::runtime_error{"Unable to find a keyfile for application '" + appname.value() + "' in container '" +
                                  container.value() + "'"};
-}
-
-std::shared_ptr<GKeyFile> keyfileFromPath(const gchar* pathname)
-{
-    if (!g_file_test(pathname, G_FILE_TEST_EXISTS))
-    {
-        return {};
-    }
-
-    std::shared_ptr<GKeyFile> keyfile(g_key_file_new(), [](GKeyFile* keyfile) {
-        if (keyfile != nullptr)
-        {
-            g_key_file_free(keyfile);
-        }
-    });
-    GError* error = nullptr;
-
-    g_key_file_load_from_file(keyfile.get(), pathname, G_KEY_FILE_NONE, &error);
-
-    if (error != nullptr)
-    {
-        g_error_free(error);
-        return {};
-    }
-
-    return keyfile;
+    }
 }
 
 std::list<std::shared_ptr<Application>> Libertine::list(const std::shared_ptr<Registry>& registry)
 
=== modified file 'tests/libual-cpp-test.cc'
--- tests/libual-cpp-test.cc	2016-04-27 14:22:00 +0000
+++ tests/libual-cpp-test.cc	2016-08-04 14:10:59 +0000
@@ -1596,6 +1596,13 @@
 
     auto info = libertine->info();
     EXPECT_TRUE((bool)info);
-
     EXPECT_EQ("Test", info->name().value());
+
+    /* Correct values for nested libertine */
+    auto nestedid = ubuntu::app_launch::AppID::parse("container-name_test-nested_0.0");
+    auto nested = ubuntu::app_launch::Application::create(libertineid, registry);
+
+    auto nestedinfo = nested->info();
+    EXPECT_TRUE((bool)info);
+    EXPECT_EQ("Test Nested", info->name().value());
 }
 
=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2015-12-18 17:21:20 +0000
+++ tests/libual-test.cc	2016-08-04 14:10:59 +0000
@@ -1667,4 +1667,11 @@
 	EXPECT_STREQ("applications/test.desktop", file);
 	g_clear_pointer(&dir, g_free);
 	g_clear_pointer(&file, g_free);
+
+  /* Correct values for nested libertine */
+  EXPECT_TRUE(ubuntu_app_launch_application_info("container-name_test-nested_0.0", &dir, &file));
+  EXPECT_STREQ(CMAKE_SOURCE_DIR "/libertine-data/libertine-container/container-name/rootfs/usr/share", dir);
+  EXPECT_STREQ("applications/nested/test-nested.desktop", file);
+  g_clear_pointer(&dir, g_free);
+  g_clear_pointer(&file, g_free);
 }