Merge lp:~ivanfateev/pantheon-files/fix-1380139 into lp:~elementary-apps/pantheon-files/trunk

[Ivan Fateev]

Added support for gnome-sushi previewer according to this bug
https://bugs.launchpad.net/pantheon-files/+bug/1380139

How to test:
- install gnome-sushi. Select file, hit space, previewer should open
- remove gnome-sushi. Select file, hit space, pantheon-files should behave as was designed before, open select file

[lp:~ivanfateev/pantheon-files/fix-1380139]

1814. By Ivan Fateev on 2015-04-30

- added full support for previewer gnome-sushi
- added enum PreviewerType - maybe files will support more previewers
- if gnome-sushi is not installed - behaviour is default (open selected file)

1815. By Ivan Fateev on 2015-04-30

removed debug messages about previewer

[Jeremy Wootten (jeremywootten)]

The problem with this is that installing gnome-sushi also installs Nautilus, which does not seem desirable. Is it possible to remove this dependency on Nautilus?

[Jeremy Wootten (jeremywootten)]

review: Needs Fixing

[Ivan Fateev (ivanfateev)]

gnome-sushi works fine without nautilus. How we can get rid of this dependency?
Unfortunately I don't have experience with packaging. Should we file a bug? If so then for which version?

[Jeremy Wootten (jeremywootten)]

I'll ask Cody. Possibly we could build our own gnome-sushi package which doesn't depend on Nautilus, instead of the Ubuntu one and have the pantheon-files package recommend it.

I'll continue the review on the assumption that this issue is not a merge blocker.

[Jeremy Wootten (jeremywootten)]

After discussion with some of the other developers, it has been decided to reject this branch for the following reasons:

1) It would bring in unwanted dependencies e.g. on gjs and X11
2) It is an elementary design decision not support a previewer in Files; there is little difference in time for the file to open in the default app compared to the previewer and the intention is to reduce any time difference further.

Thank you for your work; I am sorry we cannot accept it.

review: Disapprove

Unmerged revisions

1815. By Ivan Fateev on 2015-04-30

removed debug messages about previewer

1814. By Ivan Fateev on 2015-04-30

- added full support for previewer gnome-sushi
- added enum PreviewerType - maybe files will support more previewers
- if gnome-sushi is not installed - behaviour is default (open selected file)

1813. By Ivan Fateev on 2015-04-27

integrated gnome-sushi previewer via dbus. TODO: check whether gnome-sushi is installed. Added gdk-x11-3.0 as dependency

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-18 20:46:03 +0000
+++ src/CMakeLists.txt	2015-04-30 17:08:23 +0000
@@ -20,6 +20,7 @@
     gio-unix-2.0
     pango>=1.1.2
     gtk+-3.0>=3.10
+    gdk-x11-3.0
     gmodule-2.0
     gail-3.0
     gee-0.8
@@ -87,6 +88,7 @@
         View/Chrome/ImgEventBox.vala
     PACKAGES
         gtk+-3.0
+        gdk-x11-3.0
         gio-2.0
         posix
         gee-0.8
 
=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-04-18 12:10:52 +0000
+++ src/View/AbstractDirectoryView.vala	2015-04-30 17:08:23 +0000
@@ -25,6 +25,11 @@
 namespace FM {
     public abstract class AbstractDirectoryView : Gtk.ScrolledWindow {
 
+        public enum PreviewerType {
+            NONE,
+            GNOME_SUSHI
+        }
+
         public enum TargetType {
             STRING,
             TEXT_URI_LIST,
@@ -44,6 +49,12 @@
 
         const int MAX_TEMPLATES = 32;
 
+        const string GNOME_SUSHI_DBUS_NAME = "org.gnome.NautilusPreviewer";
+        const string GNOME_SUSHI_DBUS_IFACE = "org.gnome.NautilusPreviewer";
+        const string GNOME_SUSHI_DBUS_PATH = "/org/gnome/NautilusPreviewer";
+        const string GNOME_SUSHI_PACKAGE_NAME = "gnome-sushi";
+        const string DPKG_COMMAND_FORMAT = "dpkg --get-selections %s";
+
         const Gtk.TargetEntry [] drag_targets = {
             {"text/plain", 0, TargetType.STRING},
             {"text/uri-list", 0, TargetType.TEXT_URI_LIST}
@@ -164,7 +175,7 @@
         Marlin.Thumbnailer thumbnailer = null;
 
         /* TODO Support for preview see bug #1380139 */
-        private string? previewer = null;
+        private PreviewerType previewer_type = PreviewerType.NONE;
 
         /* Rename support */
         protected Marlin.TextRenderer? name_renderer = null;
@@ -285,6 +296,7 @@
             freeze_tree (); /* speed up loading of icon view. Thawed when directory loaded */
             set_up_zoom_level ();
             change_zoom_level ();
+            set_up_previewer.begin ();
         }
 
         ~AbstractDirectoryView () {
@@ -532,25 +544,40 @@
         }
 
         protected void preview_selected_items () {
-            if (previewer == null)  /* At present this is the case! */
-                activate_selected_items (Marlin.OpenFlag.DEFAULT);
-            else {
-                unowned GLib.List<unowned GOF.File>? selection = get_selected_files ();
-
-                if (selection == null)
-                    return;
-
-                Gdk.Screen screen = Eel.gtk_widget_get_screen (this);
-                GLib.List<GLib.File> location_list = null;
-                GOF.File file = selection.data;
-                location_list.prepend (file.location);
-                Gdk.AppLaunchContext context = screen.get_display ().get_app_launch_context ();
-                try {
-                    GLib.AppInfo previewer_app = GLib.AppInfo.create_from_commandline (previewer, null, 0);
-                    previewer_app.launch (location_list, context as GLib.AppLaunchContext);
-                } catch (GLib.Error error) {
-                    Eel.show_error_dialog (_("Failed to preview"), error.message, null);
-                }
+            unowned GLib.List<unowned GOF.File>? selection = get_selected_files ();
+
+            if (selection == null)
+                return;
+
+            switch (previewer_type) {
+                case PreviewerType.NONE:
+                    activate_selected_items (Marlin.OpenFlag.DEFAULT);
+                    break;
+                case PreviewerType.GNOME_SUSHI:
+                    var dbus = window.application.get_dbus_connection ();
+                    GOF.File file = selection.data;
+                    var xid = ((Gdk.X11.Window)get_window ()).get_xid ();
+                    var params = new GLib.Variant ("(sib)", file.uri, xid, true);
+                    dbus.call.begin (
+                        GNOME_SUSHI_DBUS_NAME,
+                        GNOME_SUSHI_DBUS_PATH,
+                        GNOME_SUSHI_DBUS_IFACE,
+                        "ShowFile",
+                        params,
+                        null,
+                        GLib.DBusCallFlags.NONE,
+                        -1,
+                        null,
+                        (obj, res) => {
+                            try {
+                                dbus.call.end(res);
+                            } catch (GLib.Error error) {
+                                Eel.show_error_dialog (_("Failed to preview"), error.message, null);
+                            }
+                        }
+                    );
+                    break;
+
             }
         }
 
@@ -3045,6 +3072,27 @@
             }
         }
 
+        /** Previewer **/
+        private async void set_up_previewer () {
+            string cmd_stdout;
+            string cmd_stderr;
+            int cmd_status;
+            try {
+                Process.spawn_command_line_sync (
+                    DPKG_COMMAND_FORMAT.printf (GNOME_SUSHI_PACKAGE_NAME),
+                    out cmd_stdout,
+                    out cmd_stderr,
+                    out cmd_status
+                );
+
+                if (cmd_stdout.index_of ("install") > 0) {
+                    previewer_type = PreviewerType.GNOME_SUSHI;
+                }
+            } catch (SpawnError e) {
+                error ("Failed to launch dpkg");
+            }
+        }
+
         public virtual void sync_selection () {}
         public virtual void highlight_path (Gtk.TreePath? path) {}
         protected virtual void add_subdirectory (GOF.Directory.Async dir) {}