Merge lp:~donadigo/appcenter/extensions into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

Show add ons for apps in app info view

Fixes bug #1528412: "Show add ons for apps in app info view".

* Note 1: this branch will not function properly due to the broken PackageRow class, the extensions as normal packages will propose to "update" instead of install. I tested it locally and the installation of extensions is working. After the bug #1593609 is fixed it will be fully working.
Optionally you can merge the lp:~benwaffle/appcenter/buttons locally and test it out.

* Note 2: The PackageRow class is unchanged so the other branch can be later merged.

[Danielle Foré (danrabbit)]

LGTM. I think Rico would say to not even create those widgets if there are no extensions instead of hiding and showing.

review: Approve (testing)

[lp:~donadigo/appcenter/extensions]

215. By Adam Bieńkowski on 2016-06-24

Add support for extensions

[Danielle Foré (danrabbit)]

Works as expected. The package row buttons are broken, but that is not within the scope of this branch. Ben's branch corrects that issue.

review: Approve (code)

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-06-19 21:09:16 +0000
+++ src/Core/Client.vala	2016-06-24 17:12:47 +0000
@@ -97,6 +97,16 @@
         }
     }
 
+    public AppStream.Component? get_extension (string extension) throws GLib.Error {
+        try {
+            return appstream_database.get_component_by_id (extension); 
+        } catch (Error e) {
+            warning ("%s\n", e.message);
+        }
+        
+        return null;
+    }
+
     public async void install_package (Package package, Pk.ProgressCallback cb, GLib.Cancellable cancellable) throws GLib.Error {
         AppCenter.Task install_task = request_task ();
         AppCenter.Task search_task = request_task ();

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-06-21 18:18:51 +0000
+++ src/Core/Package.vala	2016-06-24 17:12:47 +0000
@@ -180,7 +180,11 @@
         });
 
         if (icon == null) {
-            icon = new ThemedIcon ("application-default-icon");
+            if (component.get_kind () == AppStream.ComponentKind.ADDON) {
+                icon = new ThemedIcon ("extension");
+            } else {
+                icon = new ThemedIcon ("application-default-icon");
+            }
         }
 
         return icon;

=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2016-06-21 17:43:40 +0000
+++ src/Views/AppInfoView.vala	2016-06-24 17:12:47 +0000
@@ -34,7 +34,10 @@
     Gtk.Button action_button;
     Gtk.Button uninstall_button;
     Gtk.ProgressBar progress_bar;
+    Gtk.Grid content_grid;
+    Gtk.ListBox extension_box;
     Gtk.Label progress_label;
+    Gtk.Label extension_label;
     Gtk.Button cancel_button;
     Gtk.Stack action_stack;
 
@@ -45,6 +48,21 @@
         parse_description (package.component.get_description ());
         app_icon.gicon = package.get_icon (128);
 
+        if (package.component.get_extensions ().length > 0) {
+            extension_box = new Gtk.ListBox ();
+            extension_box.selection_mode = Gtk.SelectionMode.NONE;
+
+            extension_label = new Gtk.Label ("<b>" + _("Extensions:") + "</b>");
+            extension_label.margin_top = 12;
+            extension_label.use_markup = true;
+            extension_label.get_style_context ().add_class ("h3");
+            extension_label.halign = Gtk.Align.START;
+            
+            content_grid.add (extension_label);
+            content_grid.add (extension_box);
+            load_extensions.begin ();
+        }
+
         if (package.update_available) {
             action_button.label = _("Update");
         } else if (package.installed) {
@@ -179,7 +197,7 @@
         progress_grid.attach (progress_bar, 0, 1, 1, 1);
         progress_grid.attach (cancel_button, 1, 0, 1, 2);
 
-        var content_grid = new Gtk.Grid ();
+        content_grid = new Gtk.Grid ();
         content_grid.width_request = 800;
         content_grid.halign = Gtk.Align.CENTER;
         content_grid.margin = 24;
@@ -207,6 +225,22 @@
         });
     }
 
+    private async void load_extensions () {
+        package.component.get_extensions ().@foreach ((cid) => {
+            try {
+                var extension = Client.get_default ().get_extension (cid);
+                if (extension != null) {
+                    var row = new Widgets.PackageRow (new Package (extension));
+                    if (extension_box != null) {
+                        extension_box.add (row);
+                    }
+                }                
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
+        });            
+    }
+
     public void load_more_content () {
         new Thread<void*> ("content loading", () => {
             string url = null;