Merge lp:~midori/midori/desktop into lp:midori

[Cris Dywan]

More robust app/ profile creation

This branch includes new Test.init and Test.Job API which were found to be invaluable specifically with the apps test.

[lp:~midori/midori/desktop]

6423. By Cris Dywan on 2014-01-26

Remove contained folders in ContainTest

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'cmake/ContainTest.cmake'
--- cmake/ContainTest.cmake	2013-10-01 21:35:39 +0000
+++ cmake/ContainTest.cmake	2014-01-26 21:49:39 +0000
@@ -7,6 +7,7 @@
     set(TEST_ENV "")
     foreach(VARIABLE XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME XDG_RUNTIME_DIR TMPDIR)
         set(CONTAINER "${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/${VARIABLE}")
+        file(REMOVE_RECURSE ${CONTAINER})
         file(MAKE_DIRECTORY ${CONTAINER})
         set(TEST_ENV "${TEST_ENV}${VARIABLE}=${CONTAINER};")
     endforeach()

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-08-09 22:48:35 +0000
+++ extensions/apps.vala	2014-01-26 21:49:39 +0000
@@ -20,10 +20,37 @@
         internal string exec;
         internal string uri;
 
-        internal static async void create (string prefix, GLib.File folder, string uri, string title, Gtk.Widget proxy) {
-            /* Strip LRE leading character and / */
-            string name = title.delimit ("‪/", ' ').strip();
-            string filename = Midori.Download.clean_filename (name);
+        internal static string get_favicon_name_for_uri (string prefix, GLib.File folder, string uri, bool testing)
+        {
+            string icon_name = Midori.Stock.WEB_BROWSER;
+
+            if (testing == true)
+                return icon_name;
+
+            if (prefix != PROFILE_PREFIX)
+            {
+                try {
+                    var pixbuf = Midori.Paths.get_icon (uri, null);
+                    if (pixbuf == null)
+                        throw new FileError.EXIST ("No favicon loaded");
+                    string icon_filename = folder.get_child ("icon.png").get_path ();
+                    pixbuf.save (icon_filename, "png", null, "compression", "7", null);
+#if HAVE_WIN32
+                    string doubleslash_icon = icon_filename.replace ("\\", "\\\\");
+                    icon_name = doubleslash_icon;
+#else
+                    icon_name = icon_filename;
+#endif
+                }
+                catch (Error error) {
+                    GLib.warning (_("Failed to fetch application icon in %s: %s"), folder.get_path (), error.message);
+                }
+            }
+            return icon_name;
+        }
+
+        internal static string prepare_desktop_file (string prefix, string name, string uri, string title, string icon_name)
+        {
             string exec;
 #if HAVE_WIN32
             string doubleslash_uri = uri.replace ("\\", "\\\\");
@@ -32,62 +59,100 @@
 #else
             exec = prefix + uri;
 #endif
+            var keyfile = new GLib.KeyFile ();
+            string entry = "Desktop Entry";
+
+            keyfile.set_string (entry, "Version", "1.0");
+            keyfile.set_string (entry, "Type", "Application");
+            keyfile.set_string (entry, "Name", name);
+            keyfile.set_string (entry, "Exec", exec);
+            keyfile.set_string (entry, "TryExec", PACKAGE_NAME);
+            keyfile.set_string (entry, "Icon", icon_name);
+            keyfile.set_string (entry, "Categories", "Network;");
+
+            return keyfile.to_data();
+        }
+
+        internal static File get_app_folder () {
+            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
+            return data_dir.get_child ("apps");
+        }
+
+        internal static async File create_app (string uri, string title, Gtk.Widget? proxy) {
+            string checksum = Checksum.compute_for_string (ChecksumType.MD5, uri, -1);
+            var folder = get_app_folder ();
+            yield Launcher.create (APP_PREFIX, folder.get_child (checksum),
+                uri, title, proxy);
+            return folder.get_child (checksum);
+        }
+
+        internal static File get_profile_folder () {
+            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
+            return data_dir.get_child ("profiles");
+        }
+
+        internal static async File create_profile (Gtk.Widget? proxy) {
+            string uuid = g_dbus_generate_guid ();
+            string config = Path.build_path (Path.DIR_SEPARATOR_S,
+                Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
+            var folder = get_profile_folder ();
+            yield Launcher.create (PROFILE_PREFIX, folder.get_child (uuid),
+                config, _("Midori (%s)").printf (uuid), proxy);
+            return folder.get_child (uuid);
+        }
+
+        internal static async void create (string prefix, GLib.File folder, string uri, string title, Gtk.Widget proxy) {
+            /* Strip LRE leading character and / */
+            string name = title.delimit ("‪/", ' ').strip();
+            string filename = Midori.Download.clean_filename (name);
+            string icon_name = Midori.Stock.WEB_BROWSER;
+            bool testing = false;
+            if (proxy == null)
+                testing = true;
+            var file = folder.get_child ("desc");
+
             try {
                 folder.make_directory_with_parents (null);
-            }
-            catch (Error error) {
-                /* It's not an error if the folder already exists;
-                   any fatal problems will fail further down the line */
-            }
-
-            string icon_name = Midori.Stock.WEB_BROWSER;
-            try {
-                var pixbuf = Midori.Paths.get_icon (uri, null);
-                if (pixbuf == null)
-                    throw new FileError.EXIST ("No favicon loaded");
-                string icon_filename = folder.get_child ("icon.png").get_path ();
-                pixbuf.save (icon_filename, "png", null, "compression", "7", null);
-#if HAVE_WIN32
-                string doubleslash_icon = icon_filename.replace ("\\", "\\\\");
-                icon_name = doubleslash_icon;
-#else
-                icon_name = icon_filename;
-#endif
-            }
-            catch (Error error) {
-                GLib.warning (_("Failed to fetch application icon in %s: %s"), folder.get_path (), error.message);
-            }
-            string contents = """
-                [Desktop Entry]
-                Version=1.0
-                Type=Application
-                Name=%s
-                Exec=%s
-                TryExec=%s
-                Icon=%s
-                Categories=Network;
-                """.printf (name, exec, PACKAGE_NAME, icon_name);
-            var file = folder.get_child ("desc");
-            var browser = proxy.get_toplevel () as Midori.Browser;
+            } catch (IOError.EXISTS exist_error) {
+                /* It's no error if the folder already exists */
+            } catch (Error error) {
+                warning (_("Failed to create new launcher (%s): %s"), file.get_path (), error.message);
+            }
+
+            icon_name = get_favicon_name_for_uri (prefix, folder, uri, testing);
+            string desktop_file = prepare_desktop_file (prefix, name, uri, title, icon_name);
+
             try {
                 var stream = yield file.replace_async (null, false, GLib.FileCreateFlags.NONE);
-                yield stream.write_async (contents.data);
+                yield stream.write_async (desktop_file.data);
                 // Create a launcher/ menu
 #if HAVE_WIN32
                 Midori.Sokoke.create_win32_desktop_lnk (prefix, filename, uri);
 #else
                 var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
-                yield file.copy_async (data_dir.get_child ("applications").get_child (filename + ".desktop"),
+                var desktop_dir = data_dir.get_child ("applications");
+                try {
+                    desktop_dir.make_directory_with_parents (null);
+                } catch (IOError.EXISTS exist_error) {
+                    /* It's no error if the folder already exists */
+                }
+
+                yield file.copy_async (desktop_dir.get_child (filename + ".desktop"),
                     GLib.FileCopyFlags.NONE);
 #endif
-
-                browser.send_notification (_("Launcher created"),
-                    _("You can now run <b>%s</b> from your launcher or menu").printf (name));
+                if (proxy != null) {
+                    var browser = proxy.get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Launcher created"),
+                        _("You can now run <b>%s</b> from your launcher or menu").printf (name));
+                }
             }
             catch (Error error) {
                 warning (_("Failed to create new launcher (%s): %s"), file.get_path (), error.message);
-                browser.send_notification (_("Error creating launcher"),
-                    _("Failed to create new launcher (%s): %s").printf (file.get_path (), error.message));
+                if (proxy != null) {
+                    var browser = proxy.get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Error creating launcher"),
+                        _("Failed to create new launcher (%s): %s").printf (file.get_path (), error.message));
+                }
             }
         }
 
@@ -139,11 +204,7 @@
                 profile.is_important = true;
                 profile.show ();
                 profile.clicked.connect (() => {
-                    string uuid = g_dbus_generate_guid ();
-                    string config = Path.build_path (Path.DIR_SEPARATOR_S,
-                        Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
-                    Launcher.create.begin (PROFILE_PREFIX, profile_folder.get_child (uuid),
-                        config, _("Midori (%s)").printf (uuid), this);
+                    Launcher.create_profile.begin (this);
                 });
                 toolbar.insert (profile, -1);
 #endif
@@ -349,10 +410,8 @@
             try {
                 try {
                     app_folder.make_directory_with_parents (null);
-                }
-                catch (IOError folder_error) {
-                    if (!(folder_error is IOError.EXISTS))
-                        throw folder_error;
+                } catch (IOError.EXISTS exist_error) {
+                    /* It's no error if the folder already exists */
                 }
 
                 var monitor = app_folder.monitor_directory (0, null);
@@ -392,9 +451,7 @@
                 _("Creates a new app for a specific site"), null);
             action.activate.connect (() => {
                 var view = browser.tab as Midori.View;
-                string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
-                Launcher.create.begin (APP_PREFIX, app_folder.get_child (checksum),
-                    view.get_display_uri (), view.get_display_title (), browser);
+                Launcher.create_app.begin (view.get_display_uri (), view.get_display_title (), view);
             });
             action_group.add_action_with_accel (action, "<Ctrl><Shift>A");
             action.set_accel_group (accels);
@@ -408,12 +465,11 @@
 
         void activated (Midori.App app) {
             array = new Katze.Array (typeof (Launcher));
-            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
             monitors = new GLib.List<GLib.FileMonitor> ();
-            app_folder = data_dir.get_child ("apps");
+            app_folder = Launcher.get_app_folder ();
             populate_apps.begin (app_folder);
             /* FIXME: Profiles are broken on win32 because of no multi instance support */
-            profile_folder = data_dir.get_child ("profiles");
+            profile_folder = Launcher.get_profile_folder ();
 #if !HAVE_WIN32
             populate_apps.begin (profile_folder);
 #endif
@@ -456,3 +512,18 @@
     return new Apps.Manager ();
 }
 
+class ExtensionsAppsDesktop : Midori.Test.Job {
+    public static void test () { new ExtensionsAppsDesktop ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        var folder = yield Apps.Launcher.create_app ("http://example.com", "Example", null);
+        var launcher = new Apps.Launcher (folder);
+        launcher.init ();
+        Katze.assert_str_equal (folder.get_path (), launcher.uri, "http://example.com");
+        yield Apps.Launcher.create_profile (null);
+    }
+}
+
+public void extension_test () {
+    Test.add_func ("/extensions/apps/desktop", ExtensionsAppsDesktop.test);
+}
+

=== modified file 'midori/midori-dialog.vala'
--- midori/midori-dialog.vala	2013-11-05 14:51:49 +0000
+++ midori/midori-dialog.vala	2014-01-26 21:49:39 +0000
@@ -24,13 +24,24 @@
     }
 
     namespace Test {
+        public void init ([CCode (array_length_pos = 0.9)] ref unowned string[] args) {
+            GLib.Test.init (ref args);
+
+            /* Always log to stderr */
+            Log.set_handler (null,
+                LogLevelFlags.LEVEL_MASK | LogLevelFlags.FLAG_FATAL | LogLevelFlags.FLAG_RECURSION,
+                (domain, log_levels, message) => {
+                stderr.printf ("** %s\n", message);
+            });
+        }
+
         internal static uint test_max_timeout = 0;
         internal static string? test_first_try = null;
         public void grab_max_timeout () {
             int seconds = (Environment.get_variable ("MIDORI_TIMEOUT") ?? "42").to_int ();
             test_first_try = "once";
             test_max_timeout = GLib.Timeout.add_seconds (seconds > 0 ? seconds / 2 : 0, ()=>{
-                stdout.printf ("Timed out %s%s\n", test_first_try,
+                stderr.printf ("Timed out %s%s\n", test_first_try,
                     MainContext.default ().pending () ? " (loop)" : "");
                 if (test_first_try == "twice")
                     Process.exit (0);
@@ -50,6 +61,26 @@
             test_idle_timeouts = true;
         }
 
+        public abstract class Job : GLib.Object {
+            bool done;
+            public abstract async void run (Cancellable cancellable) throws GLib.Error;
+            async void run_wrapped (Cancellable cancellable) {
+                try {
+                    yield run (cancellable);
+                } catch (Error error) {
+                    GLib.error (error.message);
+                }
+                done = true;
+            }
+            public void run_sync () {
+                var loop = MainContext.default ();
+                var cancellable = new Cancellable ();
+                done = false;
+                run_wrapped.begin (cancellable);
+                do { loop.iteration (true); } while (!done);
+            }
+        }
+
         public void log_set_fatal_handler_for_icons () {
             GLib.Test.log_set_fatal_handler ((domain, log_levels, message)=> {
                 return !message.contains ("Error loading theme icon")

=== modified file 'tests/completion.vala'
--- tests/completion.vala	2013-12-16 22:38:24 +0000
+++ tests/completion.vala	2014-01-26 21:49:39 +0000
@@ -87,43 +87,26 @@
         error ("Expected %d but got %d", 3, n);
 }
 
-async void complete_history (Midori.HistoryDatabase history) {
-    try {
-        history.insert ("http://example.com", "Ejemplo", 0, 0);
-    } catch (Error error) {
-        assert_not_reached ();
-    }
-    var cancellable = new Cancellable ();
-    var results = yield history.list_by_count_with_bookmarks ("example", 1, cancellable);
-    assert (results.length () == 1);
-    var first = results.nth_data (0);
-    assert (first.title == "Ejemplo");
-    results = yield history.list_by_count_with_bookmarks ("ejemplo", 1, cancellable);
-    assert (results.length () == 1);
-    first = results.nth_data (0);
-    assert (first.title == "Ejemplo");
-    complete_history_done = true;
-}
-
-bool complete_history_done = false;
-void completion_history () {
-    var app = new Midori.App ();
-    Midori.HistoryDatabase history;
-    try {
+class CompletionHistory : Midori.Test.Job {
+    public static void test () { new CompletionHistory ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
         var bookmarks_database = new Midori.BookmarksDatabase ();
         assert (bookmarks_database.db != null);
-        history = new Midori.HistoryDatabase (app);
+
+        Midori.HistoryDatabase history = new Midori.HistoryDatabase (null);
         assert (history.db != null);
         history.clear (0);
-    } catch (Midori.DatabaseError error) {
-        assert_not_reached();
+
+        history.insert ("http://example.com", "Ejemplo", 0, 0);
+        var results = yield history.list_by_count_with_bookmarks ("example", 1, cancellable);
+        assert (results.length () == 1);
+        var first = results.nth_data (0);
+        assert (first.title == "Ejemplo");
+        results = yield history.list_by_count_with_bookmarks ("ejemplo", 1, cancellable);
+        assert (results.length () == 1);
+        first = results.nth_data (0);
+        assert (first.title == "Ejemplo");
     }
-
-    Midori.Test.grab_max_timeout ();
-    var loop = MainContext.default ();
-    complete_history.begin (history);
-    do { loop.iteration (true); } while (!complete_history_done);
-    Midori.Test.release_max_timeout ();
 }
 
 struct TestCaseRender {
@@ -154,11 +137,11 @@
 }
 
 void main (string[] args) {
-    Test.init (ref args);
+    Midori.Test.init (ref args);
     Midori.App.setup (ref args, null);
     Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
     Test.add_func ("/completion/autocompleter", completion_autocompleter);
-    Test.add_func ("/completion/history", completion_history);
+    Test.add_func ("/completion/history", CompletionHistory.test);
     Test.add_func ("/completion/location-action", completion_location_action);
     Test.run ();
 }

=== modified file 'tests/extensions.c'
--- tests/extensions.c	2013-10-29 18:45:01 +0000
+++ tests/extensions.c	2014-01-26 21:49:39 +0000
@@ -216,7 +216,7 @@
 main (int    argc,
       char** argv)
 {
-    g_test_init (&argc, &argv, NULL);
+    midori_test_init (&argc, &argv);
     midori_app_setup (&argc, &argv, NULL);
     midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
     #ifndef HAVE_WEBKIT2