Merge lp:~donadigo/appcenter/apt-link-support into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Add support for appstream links

This branch fixes bug #1628476: "Affiliate AppCenter with x-scheme-handler/apt mime type".

Most of the scheme handling code was taken from the recent switchboard change at revision 691.

This branch actually implements handling for appstream links as discussed on Slack instead of apt links.

To test run e.g:
appcenter appstream://org.pantheon.snap.desktop

[lp:~donadigo/appcenter/apt-link-support]

357. By Adam Bieńkowski on 2016-12-27

Instead of apt, support appstream

[Corentin Noël (tintou)]

Tested with xdg-open appstream://org.pantheon.appcenter.desktop
Working as expected

review: Approve

=== modified file 'data/org.pantheon.appcenter.desktop.in.in'
--- data/org.pantheon.appcenter.desktop.in.in	2016-06-18 05:11:27 +0000
+++ data/org.pantheon.appcenter.desktop.in.in	2016-12-27 23:46:08 +0000
@@ -8,6 +8,7 @@
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;System;PackageManager;
+MimeType=x-scheme-handler/appstream;
 Actions=AboutDialog;
 X-GNOME-UsesNotifications=true
 

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-12-06 22:05:26 +0000
+++ src/Application.vala	2016-12-27 23:46:08 +0000
@@ -25,12 +25,14 @@
 
     private const int SECONDS_AFTER_NETWORK_UP = 60;
 
+    private static string? link = null;
+
     public static bool show_updates;
     public static bool silent;
     MainWindow main_window;
     construct {
         application_id = "org.pantheon.appcenter";
-        flags = ApplicationFlags.FLAGS_NONE;
+        flags |= ApplicationFlags.HANDLES_OPEN;
         Intl.setlocale (LocaleCategory.ALL, "");
         Intl.textdomain (Build.GETTEXT_PACKAGE);
 
@@ -63,10 +65,35 @@
             }
         });
 
+        if (AppInfo.get_default_for_uri_scheme ("appstream") == null) {
+            var appinfo = new DesktopAppInfo (app_launcher);
+            try {
+                appinfo.set_as_default_for_type ("x-scheme-handler/appstream");
+            } catch (Error e) {
+                critical ("Unable to set default for the settings scheme: %s", e.message);
+            }
+        }
+
         add_action (quit_action);
         add_accelerator ("<Control>q", "app.quit", null);
     }
 
+    public override void open (File[] files, string hint) {
+        var file = files[0];
+        if (file == null) {
+            return;
+        }
+
+        if (file.has_uri_scheme ("appstream")) {
+            link = file.get_uri ().replace ("appstream://", "");
+            if (link.has_suffix ("/")) {
+                link = link.substring (0, link.last_index_of_char ('/'));
+            }
+        }
+
+        activate ();
+    }
+
     public override void activate () {
         var client = AppCenterCore.Client.get_default ();
         if (silent) {
@@ -88,6 +115,15 @@
                 main_window = null;
             });
 
+            if (link != null) {
+                var package = client.get_package_for_id (link);
+                if (package != null) {
+                    main_window.show_package (package);
+                } else {
+                    warning (_("Specified link '%s' could not be found, going back to the main panel").printf (link));
+                }
+            }
+
             add_window (main_window);
             main_window.show_all ();
             if (show_updates) {

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-12-02 09:24:22 +0000
+++ src/Core/Client.vala	2016-12-27 23:46:08 +0000
@@ -466,6 +466,17 @@
         return installed;
     }
 
+    public AppCenterCore.Package? get_package_for_id (string id) {
+        foreach (var entry in package_list.entries) {
+            var package = entry.value;
+            if (package.component.id == id) {
+                return package;
+            }
+        }
+
+        return null;
+    }
+
     private static GLib.Once<Client> instance;
     public static unowned Client get_default () {
         return instance.once (() => { return new Client (); });

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2016-11-06 15:33:30 +0000
+++ src/MainWindow.vala	2016-12-27 23:46:08 +0000
@@ -184,6 +184,11 @@
         return false;
     }
 
+    public void show_package (AppCenterCore.Package package) {
+        category_view.show_package (package);
+        view_opened (_("Categories"), false, null);    
+    }
+
     public void go_to_installed () {
         view_mode.selected = 1;
     }