Merge lp:~alecu/unity-scope-click/prevent-non-removable into lp:unity-scope-click

[Alejandro J. Cura]

Don't show Uninstall button if manifest has _removable:0, and remove pin-to-launcher

[dobey (dobey)]

48 + // Pin to launcher is descoped for 13.10
49 + //preview.add_action (new Unity.PreviewAction (ACTION_PIN_TO_LAUNCHER, ("Pin to launcher"), null));

It's better to just delete code, rather than commenting it out. We have a great version control system, and can easily find old code if necessary. And if/when we add something back, it could be done in a completely different way, necessitating the removal of the commented code, anyway.

review: Needs Fixing

[lp:~alecu/unity-scope-click/prevent-non-removable]

62. By Alejandro J. Cura on 2013-10-01

remove commented code, better handle manifest errors

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/42

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/48/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/46

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/52/rebuild

review: Approve (continuous-integration)

=== modified file 'src/click-interface.vala'
--- src/click-interface.vala	2013-09-26 12:54:37 +0000
+++ src/click-interface.vala	2013-10-01 15:29:32 +0000
@@ -21,7 +21,6 @@
 
 public class ClickInterface : GLib.Object {
     const string ARG_DESKTOP_FILE_HINT = "--desktop_file_hint";
-    delegate void ProcessManifestFunc (Json.Object manifest);
 
     public string get_click_id (string full_app_id) {
         return full_app_id.split("_")[0];
@@ -110,6 +109,30 @@
         throw new ClickError.EXEC_FAILURE(msg);
     }
 
+    public async bool can_uninstall (string app_id) {
+        const string REMOVABLE_FIELD = "_removable";
+        GLib.List<weak Json.Node> manifests;
+        try {
+            manifests = yield get_manifests();
+        } catch (ClickError e) {
+            debug ("Can't get _removable for %s, ignoring", app_id);
+            return true;
+        }
+        foreach (var element in manifests) {
+            var manifest = element.get_object();
+            var pkg_name = manifest.get_string_member("name");
+            if (pkg_name == app_id) {
+                if (manifest.has_member(REMOVABLE_FIELD)) {
+                    var removable = manifest.get_int_member(REMOVABLE_FIELD);
+                    return removable != 0;
+                } else {
+                    return true;
+                }
+            }
+        }
+        return true;
+    }
+
     public async void uninstall (string app_id) throws ClickError {
         string version = null;
         try {

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-09-30 20:39:27 +0000
+++ src/click-scope.vala	2013-10-01 15:29:32 +0000
@@ -69,6 +69,8 @@
   const string LABEL_REVIEWS = "Reviews";
   const string LABEL_COMMENTS = "Comments";
 
+  ClickInterface click_if = new ClickInterface ();
+
   public ClickScope ()
   {
   }
@@ -111,8 +113,10 @@
     async Unity.Preview build_installed_preview (string app_id, string application_uri) {
         Unity.Preview preview = yield build_app_preview (app_id);
         preview.add_action (new Unity.PreviewAction (ACTION_OPEN_CLICK + ":" + application_uri, ("Open"), null));
-        preview.add_action (new Unity.PreviewAction (ACTION_PIN_TO_LAUNCHER, ("Pin to launcher"), null));
-        preview.add_action (new Unity.PreviewAction (ACTION_UNINSTALL_CLICK, ("Uninstall"), null));
+
+        if (yield click_if.can_uninstall (app_id)) {
+            preview.add_action (new Unity.PreviewAction (ACTION_UNINSTALL_CLICK, ("Uninstall"), null));
+        }
         return preview;
     }
 
@@ -153,7 +157,6 @@
             } else if (action_id == ACTION_DOWNLOAD_COMPLETED) {
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);
-                var click_if = new ClickInterface ();
                 var dotdesktop = yield click_if.get_dotdesktop(app_id);
                 // application name *must* be in path part of URL as host part
                 // might get lowercased
@@ -164,7 +167,6 @@
                 debug ("Let the dash launch the app: %s", application_uri);
                 return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED, application_uri);
             } else if (action_id == ACTION_UNINSTALL_CLICK) {
-                var click_if = new ClickInterface ();
                 yield click_if.uninstall(app_id);
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);