Merge lp:~kalikiana/midori/apps into lp:midori

[Cris Dywan]

Store data of app mode based on URL in ~/.local/share/midori/apps

Store data of app mode based on URL in ~/.local/share/midori/apps

[Paweł Forysiuk (tuxator)]

Seems like changes in midori_normal_app_new () arguments are not reflected in test
and in midori.vapi file

After changing this test will also fail with assert like below.

/app/web:
(/home/pawel/src/midori/_build/default/tests/test-app:20359): GLib-CRITICAL **: g_compute_checksum_for_string: assertion `length == 0 || str != NULL' failed

Could be also wise to add this new path to about:paths maybe?

review: Needs Fixing

[André Stösel (ivaldi)]

I proposed merging a small patch into this branch before committing.

review: Needs Fixing

[André Stösel (ivaldi)]

IMHO the leading whitespace in every line of the .desktop file isn't a nice solution, but I don't know if joining the lines would actually be a better one.

[Cody Garver (codygarver)]

https://code.launchpad.net/~ivaldi/midori/apps/+merge/165684

[lp:~kalikiana/midori/apps]

6173. By Cris Dywan on 2013-05-24

Replace .gitignore with a .bzrignore

6174. By gue5t <email address hidden> on 2013-05-27

Compare uri schemes case-insensitively.

6175. By gue5t <email address hidden> on 2013-05-27

make commandline download-manager handle parameters more consistently, fixing nullable strings

6176. By André Stösel on 2013-05-27

Fix History List memory leak when closing Midori window.

6177. By Paweł Forysiuk on 2013-05-27

Split colorful tabs code into helper functions and add unit tests

[André Stösel (ivaldi)]

review: Approve

[lp:~kalikiana/midori/apps]

6178. By Cris Dywan on 2013-05-28

Store data of app mode based on URL in ~/.local/share/midori/apps

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-04-20 00:46:39 +0000
+++ extensions/apps.vala	2013-05-27 21:17:24 +0000
@@ -10,7 +10,8 @@
 */
 
 namespace Apps {
-    const string EXEC_PREFIX = PACKAGE_NAME + " -a ";
+    const string APP_PREFIX = PACKAGE_NAME + " -a ";
+    const string PROFILE_PREFIX = PACKAGE_NAME + " -c ";
 
     private class Launcher : GLib.Object, GLib.Initable {
         internal GLib.File file;
@@ -19,10 +20,10 @@
         internal string exec;
         internal string uri;
 
-        internal static async void create (GLib.File folder, string uri, string title) {
+        internal static async void create (string prefix, GLib.File folder, string uri, string title) {
             /* Strip LRE leading character and / */
-            string filename = title.delimit ("‪/", ' ') + ".desktop";
-            string exec = EXEC_PREFIX + uri;
+            string filename = title.delimit ("‪/", ' ').strip() + ".desktop";
+            string exec = prefix + uri;
             string name = title;
             // TODO: Midori.Paths.get_icon save to png
             string icon_name = Midori.Stock.WEB_BROWSER;
@@ -58,12 +59,12 @@
             var keyfile = new GLib.KeyFile ();
             keyfile.load_from_file (file.get_path (), GLib.KeyFileFlags.NONE);
             exec = keyfile.get_string ("Desktop Entry", "Exec");
-            if (!exec.has_prefix (EXEC_PREFIX))
+            if (!exec.has_prefix (APP_PREFIX) && !exec.has_prefix (PROFILE_PREFIX))
                 return false;
 
             name = keyfile.get_string ("Desktop Entry", "Name");
             icon_name = keyfile.get_string ("Desktop Entry", "Icon");
-            uri = exec.replace (EXEC_PREFIX, "");
+            uri = exec.replace (APP_PREFIX, "").replace (PROFILE_PREFIX, "");
             return true;
         }
     }
@@ -73,6 +74,7 @@
         Gtk.ListStore store = new Gtk.ListStore (1, typeof (Launcher));
         Gtk.TreeView treeview;
         Katze.Array array;
+        GLib.File app_folder;
 
         public unowned string get_stock_id () {
             return Midori.Stock.WEB_BROWSER;
@@ -86,11 +88,39 @@
             if (toolbar == null) {
                 toolbar = new Gtk.Toolbar ();
                 toolbar.set_icon_size (Gtk.IconSize.BUTTON);
+
+                var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
+                profile.label = _("New _Profile");
+                profile.tooltip_text = _("Creates a new, independant profile and a launcher");
+                profile.use_underline = true;
+                profile.is_important = true;
+                profile.show ();
+                profile.clicked.connect (() => {
+                    string uuid = GLib.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, app_folder,
+                        config, _("Midori (%s)").printf (uuid));
+                });
+                toolbar.insert (profile, -1);
+
+                var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
+                app.label = _("New _App");
+                app.tooltip_text = _("Creates a new app for a specific site");
+                app.use_underline = true;
+                app.is_important = true;
+                app.show ();
+                app.clicked.connect (() => {
+                    var view = (get_toplevel () as Midori.Browser).tab as Midori.View;
+                    Launcher.create.begin (APP_PREFIX, app_folder,
+                        view.get_display_uri (), view.get_display_title ());
+                });
+                toolbar.insert (app, -1);
             }
             return toolbar;
         }
 
-        public Sidebar (Katze.Array array) {
+        public Sidebar (Katze.Array array, GLib.File app_folder) {
             Gtk.TreeViewColumn column;
 
             treeview = new Gtk.TreeView.with_model (store);
@@ -121,6 +151,8 @@
             array.remove_item.connect (launcher_removed);
             foreach (GLib.Object item in array.get_items ())
                 launcher_added (item);
+
+            this.app_folder = app_folder;
         }
 
         private int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
@@ -238,13 +270,13 @@
             menu.append (menuitem);
             menuitem.activate.connect (() => {
                 var view = browser.tab as Midori.View;
-                Launcher.create.begin (app_folder,
+                Launcher.create.begin (APP_PREFIX, app_folder,
                     view.get_display_uri (), view.get_display_title ());
             });
         }
 
         void browser_added (Midori.Browser browser) {
-            var viewable = new Sidebar (array);
+            var viewable = new Sidebar (array, app_folder);
             viewable.show ();
             browser.panel.append_page (viewable);
             browser.populate_tool_menu.connect (tool_menu_populated);

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-04-07 19:54:36 +0000
+++ katze/midori-paths.vala	2013-05-27 21:17:24 +0000
@@ -113,7 +113,16 @@
                 tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
                     exec_path, "profile", "tmp");
             }
-            else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
+            else if (mode == RuntimeMode.APP) {
+                config_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+                    Environment.get_user_data_dir (), PACKAGE_NAME, "apps",
+                    Checksum.compute_for_string (ChecksumType.MD5, config, -1));
+                cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+                    Environment.get_user_cache_dir (), PACKAGE_NAME);
+                user_data_dir_for_reading = Environment.get_user_data_dir ();
+                tmp_dir = get_runtime_dir ();
+            }
+            else if (mode == RuntimeMode.PRIVATE) {
                 string? real_config = config != null && !Path.is_absolute (config)
                     ? Path.build_filename (Environment.get_current_dir (), config) : config;
                 readonly_dir = real_config ?? Path.build_path (Path.DIR_SEPARATOR_S,

=== modified file 'midori/main.c'
--- midori/main.c	2013-05-19 09:33:02 +0000
+++ midori/main.c	2013-05-27 21:17:24 +0000
@@ -398,7 +398,7 @@
 
     if (webapp)
     {
-        MidoriBrowser* browser = midori_web_app_new (config, webapp,
+        MidoriBrowser* browser = midori_web_app_new (webapp,
             uris, execute, inactivity_reset, block_uris);
         g_signal_connect (browser, "destroy", G_CALLBACK (gtk_main_quit), NULL);
         g_signal_connect (browser, "quit", G_CALLBACK (gtk_main_quit), NULL);
@@ -407,7 +407,7 @@
     }
 
     MidoriApp* app = midori_normal_app_new (config,
-        portable ? "portable" : "normal", diagnostic_dialog, webapp,
+        portable ? "portable" : "normal", diagnostic_dialog,
         uris, execute, inactivity_reset, block_uris);
     if (app == NULL)
         return 0;

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-05-19 15:50:18 +0000
+++ midori/midori-frontend.c	2013-05-27 21:17:24 +0000
@@ -37,19 +37,16 @@
 }
 
 MidoriBrowser*
-midori_web_app_new (const gchar* config,
-                    const gchar* webapp,
+midori_web_app_new (const gchar* webapp,
                     gchar**      open_uris,
                     gchar**      execute_commands,
                     gint         inactivity_reset,
                     const gchar* block_uris)
 {
     guint i;
+    g_return_val_if_fail (webapp != NULL, NULL);
 
-    midori_paths_init (MIDORI_RUNTIME_MODE_APP, config);
-#ifndef HAVE_WEBKIT2
-    g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1);
-#endif
+    midori_paths_init (MIDORI_RUNTIME_MODE_APP, webapp);
     MidoriBrowser* browser = midori_browser_new ();
     g_signal_connect (browser, "new-window",
         G_CALLBACK (midori_frontend_browser_new_window_cb), NULL);
@@ -57,18 +54,18 @@
     midori_browser_set_action_visible (browser, "Menubar", FALSE);
     midori_browser_set_action_visible (browser, "CompactMenu", FALSE);
 
-    MidoriWebSettings* settings = midori_browser_get_settings (browser);
+    MidoriWebSettings* settings = midori_settings_new_full (NULL);
     g_object_set (settings,
                   "show-menubar", FALSE,
                   "show-navigationbar", FALSE,
-                  "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage",
+                  "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage,Preferences",
                   "show-statusbar", FALSE,
                   "show-panel", FALSE,
                   "last-window-state", MIDORI_WINDOW_NORMAL,
                   "inactivity-reset", inactivity_reset,
                   "block-uris", block_uris,
                   NULL);
-    midori_load_soup_session (settings);
+    midori_load_soup_session_full (settings);
 
     KatzeArray* search_engines = midori_search_engines_new_from_folder (NULL);
     g_object_set (browser,
@@ -101,6 +98,7 @@
         midori_browser_assert_action (browser, execute_commands[i]);
         midori_browser_activate_action (browser, execute_commands[i]);
     }
+    midori_session_persistent_settings (settings, NULL);
     return browser;
 }
 
@@ -426,7 +424,6 @@
 midori_normal_app_new (const gchar* config,
                        gchar*       nickname,
                        gboolean     diagnostic_dialog,
-                       const gchar* webapp,
                        gchar**      open_uris,
                        gchar**      execute_commands,
                        gint         inactivity_reset,

=== modified file 'midori/midori-frontend.h'
--- midori/midori-frontend.h	2013-05-19 09:43:05 +0000
+++ midori/midori-frontend.h	2013-05-27 21:17:24 +0000
@@ -15,8 +15,7 @@
 #include "midori/midori-app.h"
 
 MidoriBrowser*
-midori_web_app_new (const gchar* config,
-                    const gchar* webapp,
+midori_web_app_new (const gchar* webapp,
                     gchar**      open_uris,
                     gchar**      execute_commands,
                     gint         inactivity_reset,
@@ -34,7 +33,6 @@
 midori_normal_app_new (const gchar* config,
                        gchar*       nickname,
                        gboolean     diagnostic_dialog,
-                       const gchar* webapp,
                        gchar**      open_uris,
                        gchar**      execute_commands,
                        gint         inactivity_reset,

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-05-19 09:33:02 +0000
+++ midori/midori-session.c	2013-05-27 21:17:24 +0000
@@ -12,9 +12,7 @@
 #include "midori/midori-session.h"
 
 #include <midori/midori-core.h>
-#include "midori-app.h"
 #include "midori-array.h"
-#include "midori-websettings.h"
 #include "midori-extension.h"
 #include "sokoke.h"
 
@@ -371,6 +369,13 @@
     g_free (config_file);
 }
 
+void
+midori_session_persistent_settings (MidoriWebSettings* settings,
+                                    MidoriApp*         app)
+{
+    g_signal_connect_after (settings, "notify", G_CALLBACK (settings_notify_cb), app);
+}
+
 static void
 midori_browser_action_last_session_activate_cb (GtkAction*     action,
                                                 MidoriBrowser* browser)
@@ -470,7 +475,7 @@
     #endif
 
     browser = midori_app_create_browser (app);
-    g_signal_connect_after (settings, "notify", G_CALLBACK (settings_notify_cb), app);
+    midori_session_persistent_settings (settings, app);
 
     config_file = midori_paths_get_config_filename_for_reading ("session.old.xbel");
     if (g_access (config_file, F_OK) == 0)

=== modified file 'midori/midori-session.h'
--- midori/midori-session.h	2013-05-19 09:33:02 +0000
+++ midori/midori-session.h	2013-05-27 21:17:24 +0000
@@ -13,6 +13,8 @@
 #define __MIDORI_SESSION_H__
 
 #include <glib/gstdio.h>
+#include "midori-app.h"
+#include "midori-websettings.h"
 
 gboolean
 midori_load_soup_session (gpointer settings);
@@ -26,5 +28,9 @@
 gboolean
 midori_load_session (gpointer data);
 
+void
+midori_session_persistent_settings (MidoriWebSettings* settings,
+                                    MidoriApp*         app);
+
 #endif /* __MIDORI_SESSION_H__ */
 

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-05-08 00:51:02 +0000
+++ midori/midori-view.c	2013-05-27 21:17:24 +0000
@@ -4431,11 +4431,13 @@
                 data = g_markup_printf_escaped ("<body><h1>%s</h1>"
                     "<p>config: <code>%s</code></p>"
                     "<p>res: <code>%s</code></p>"
+                    "<p>data: <code>%s/%s</code></p>"
                     "<p>lib: <code>%s</code></p>"
                     "<p>cache: <code>%s</code></p>"
                     "<p>tmp: <code>%s</code></p>"
                     "</body>",
                     uri, midori_paths_get_config_dir_for_reading (), res_dir,
+                    midori_paths_get_user_data_dir_for_reading (), PACKAGE_NAME,
                     lib_dir, midori_paths_get_cache_dir_for_reading (), midori_paths_get_tmp_dir ());
                 g_free (res_dir);
                 g_free (lib_dir);

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-04-22 23:01:10 +0000
+++ midori/midori.vapi	2013-05-27 21:17:24 +0000
@@ -13,12 +13,12 @@
     }
 
     [CCode (cheader_filename = "midori/midori.h")]
-    public static unowned Midori.Browser web_app_new (string? config,
-        string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
+    public static unowned Midori.Browser web_app_new (
+        string webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static unowned Midori.Browser private_app_new (string? config,
         string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static unowned App normal_app_new (string? config, string nickname, bool diagnostic,
-        string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
+        [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static void normal_app_on_quit (App app);
 
     [CCode (cheader_filename = "midori/midori.h")]

=== modified file 'tests/app.vala'
--- tests/app.vala	2013-04-11 21:57:51 +0000
+++ tests/app.vala	2013-05-27 21:17:24 +0000
@@ -23,7 +23,7 @@
     Midori.Test.log_set_fatal_handler_for_icons ();
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-normal", false, null, null, null, -1, null);
+    var app = Midori.normal_app_new (null, "test-normal", false, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     for (var i = 0 ; i < 7; i++) {
@@ -47,7 +47,7 @@
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
     var app = Midori.normal_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"),
-        "test-custom-config-normal", false, null, null, null, -1, null);
+        "test-custom-config-normal", false, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     assert (check_sensible_window_size (app.browser, app.settings));
@@ -67,7 +67,7 @@
 void app_web () {
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var browser = Midori.web_app_new (null, null, null, null, -1, null);
+    var browser = Midori.web_app_new ("https://mail.google.com", null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     assert (check_sensible_window_size (browser, browser.settings));
@@ -76,7 +76,7 @@
 void app_web_custom_config () {
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var browser = Midori.web_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"), null, null, null, -1, null);
+    var browser = Midori.web_app_new ("https://mail.google.com", null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     assert (check_sensible_window_size (browser, browser.settings));
@@ -90,7 +90,7 @@
     Midori.Test.log_set_fatal_handler_for_icons ();
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, null, -1, null);
+    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     /* No extensions loaded */
@@ -136,7 +136,7 @@
     Midori.Test.log_set_fatal_handler_for_icons ();
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, null, -1, null);
+    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     Midori.Extension.load_from_folder (app, null, false);