Merge lp:~elementary-apps/granite/contractor-supports-multiple into lp:~elementary-pantheon/granite/granite

[Tom Beckmann]

This branch adds support for contractor's new support_multiple_files field. API-wise, you can call it directly on a Contract instance or rely on get_contracts_for_file[s](), which will now filter the contracts returned by contractor to remove those which only support a single file, if multiple files have been passed to the methods.

This branch relies on https://code.launchpad.net/~elementary-apps/contractor/multiple-files/+merge/231132 Otherwise apps will crash immediately if they use contractor directly or if they have a contractor plugin, like pantheon-files, the plugin won't load with an undefined symbol error.

[xapantu (xapantu)]

Hum, can you elaborate on the "Otherwise apps will crash immediately". Does that mean it breaks API or is it more complicated?

Does this branch still need to be merged or has it been superseded because of our lack of reactivity?

review: Needs Information

Unmerged revisions

770. By Tom Beckmann on 2014-08-17

add support for contractor's new support_multiple_files field

=== modified file 'lib/Services/ContractorProxy.vala'
--- lib/Services/ContractorProxy.vala	2014-04-09 00:03:08 +0000
+++ lib/Services/ContractorProxy.vala	2014-08-17 21:23:51 +0000
@@ -49,6 +49,15 @@
         public abstract Icon get_icon ();
 
         /**
+         * Returns whether the contract's program supports invocation with multiple files.
+         * If called with multiple files anyway, the program will only be invoked with the
+         * first file in the list.
+         *
+         * @return Whether the contract supports multiple files.
+         */
+        public abstract bool supports_multiple_files ();
+
+        /**
          * Executes the action on the given file
          */
         public abstract void execute_with_file (File file) throws Error;
@@ -80,6 +89,7 @@
         string display_name;
         string description;
         string icon;
+        bool supports_multiple_files;
     }
 
     [DBus (name = "org.elementary.Contractor")]
@@ -103,6 +113,7 @@
             private string display_name;
             private string description;
             private string icon_key;
+            private bool _supports_multiple_files;
 
             private Icon icon;
 
@@ -115,6 +126,7 @@
                 id = data.id ?? "";
                 display_name = data.display_name ?? "";
                 description = data.description ?? "";
+                _supports_multiple_files = data.supports_multiple_files;
 
                 if (icon_key != data.icon) {
                     icon_key = data.icon ?? "";
@@ -141,6 +153,10 @@
                 return icon;
             }
 
+            public bool supports_multiple_files () {
+                return _supports_multiple_files;
+            }
+
             public void execute_with_file (File file) throws Error {
                 ContractorProxy.execute_with_uri (id, file.get_uri ());
             }
@@ -310,7 +326,18 @@
                 mime_types.add (ContentType.get_mime_type (content_type));
             }
 
-            return get_contracts_by_mimelist (mime_types.to_array ());
+            var needs_multiple_support = files.length > 1;
+            var list = get_contracts_by_mimelist (mime_types.to_array ());
+
+            if (needs_multiple_support) {
+                var iter = list.iterator ();
+                while (iter.next ()) {
+                    if (!iter.@get ().supports_multiple_files ())
+                        iter.remove ();
+                }
+            }
+
+            return list;
         }
 
         private static Gee.List<Contract> get_contracts_from_data (ContractData[] data) {