Merge lp:~alecu/unity-scope-click/revert-package-updates into lp:unity-scope-click

[Alejandro J. Cura]

Revert package updates from the scope.

Revert package updates from the scope.

[Roberto Alsina (ralsina)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/click-interface.vala'
--- src/click-interface.vala	2013-09-03 21:08:38 +0000
+++ src/click-interface.vala	2013-09-23 15:57:22 +0000
@@ -36,8 +36,6 @@
         var result = new Gee.ArrayList<App>();
         var mgr = Unity.AppInfoManager.get_default();
 
-        var versions = yield get_versions();
-
         foreach (var appinfo in GLib.AppInfo.get_all()) {
             var id = appinfo.get_id();
             var path = mgr.get_path(id);
@@ -47,14 +45,12 @@
                 dotdesktop.load_from_file (path, KeyFileFlags.NONE);
                 if (dotdesktop.has_key("Desktop Entry", "X-Ubuntu-Application-ID") ) {
                     var full_app_id = dotdesktop.get_string ("Desktop Entry", "X-Ubuntu-Application-ID");
+                    debug ("installed apps: %s (%s) - %s", appinfo.get_name(), full_app_id, path);
                     var app = new App();
                     app.uri = "application://" + id;
                     app.title = appinfo.get_name();
-                    app.price = "";
                     app.app_id = get_click_id(full_app_id);
                     app.icon_url = dotdesktop.get_string ("Desktop Entry", "Icon");
-                    app.installed_version = versions[app.app_id];
-                    debug ("installed apps: %s (%s) - %s %s", appinfo.get_name(), full_app_id, path, versions[app.app_id]);
                     result.add (app);
                 }
             } catch (GLib.Error e) {
@@ -65,18 +61,6 @@
         return result;
     }
 
-    async Gee.Map<string, string> get_versions () throws ClickError {
-        var versions = new Gee.HashMap<string, string>();
-        var manifests = yield get_manifests ();
-        foreach (var element in manifests) {
-            var manifest = element.get_object();
-            var package_name = manifest.get_string_member("name");
-            var package_version = manifest.get_string_member("version");
-            versions[package_name] = package_version;
-        }
-        return versions;
-    }
-
     async List<unowned Json.Node> get_manifests () throws ClickError {
         int stdout_fd;
         string?[] args = {"click", "list", "--manifest", null};

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-09-12 18:47:10 +0000
+++ src/click-scope.vala	2013-09-23 15:57:22 +0000
@@ -27,7 +27,6 @@
 
 private const int CATEGORY_INSTALLED = 0;
 private const int CATEGORY_SUGGESTIONS = 1;
-private const int CATEGORY_UPDATES = 2;
 
 errordomain ClickScopeError {
     INSTALL_ERROR
@@ -250,9 +249,8 @@
   {
     var categories = new Unity.CategorySet ();
     var icon = new FileIcon(File.new_for_path("/usr/share/icons/unity-icon-theme/places/svg/group-treat-yourself.svg"));
-    categories.add (new Unity.Category("installed", "Installed", icon, Unity.CategoryRenderer.GRID));   // CATEGORY_INSTALLED
-    categories.add (new Unity.Category("more", "More suggestions", icon, Unity.CategoryRenderer.GRID)); // CATEGORY_SUGGESTIONS
-    categories.add (new Unity.Category("updates", "Needing update", icon, Unity.CategoryRenderer.GRID)); // CATEGORY_UPDATES
+    categories.add (new Unity.Category("installed", "Installed", icon, Unity.CategoryRenderer.GRID));   // 0
+    categories.add (new Unity.Category("more", "More suggestions", icon, Unity.CategoryRenderer.GRID)); // 1
     return categories;
   }
 
@@ -340,24 +338,11 @@
     }
   }
 
-  async void find_available_updates (string search_query) {
-    var webservice = new ClickWebservice();
-    try {
-        debug ("installed: %p (%d)", installed, installed.size);
-        var apps = yield webservice.find_updates (installed);
-        foreach (var app in apps) {
-            add_app (app, CATEGORY_UPDATES);
-        }
-    } catch (WebserviceError e) {
-        debug ("Error calling webservice: %s", e.message);
-        // TODO: warn about this some other way, like notifications
-    }
-  }
-
   async void find_apps (string search_query) {
     yield find_installed_apps (search_query);
     yield find_available_apps (search_query);
-    yield find_available_updates (search_query);
+    // TODO: updates coming real soon
+    //yield find_available_updates (search_query);
   }
 
   public override void run ()

=== modified file 'src/click-webservice.vala'
--- src/click-webservice.vala	2013-09-03 22:24:15 +0000
+++ src/click-webservice.vala	2013-09-23 15:57:22 +0000
@@ -31,7 +31,6 @@
 const string JSON_FIELD_SCREENSHOT_URLS = "screenshot_urls";
 const string JSON_FIELD_DESCRIPTION = "description";
 const string JSON_FIELD_KEYWORDS = "keywords";
-const string JSON_FIELD_VERSION = "version";
 
 errordomain WebserviceError {
     HTTP_ERROR,
@@ -47,20 +46,12 @@
     public string price { get; set; }
     public string icon_url { get; set; }
     public string uri { get; set; }
-    public string installed_version { get; set; }
-    public string available_version { get; set; }
     public static const string CLICK_INSTALL_SCHEMA = "click-install://";
-    public static const string CLICK_UPDATE_SCHEMA = "click-update://";
     public static const string WHITESPACE = " \t\n\r";
 
     //string? cmdline;  // NULL if not installed
     //bool was_lauched; // to show the NEW emblem
 
-    public bool needs_update () {
-        // TODO: needs a nicer debian version check
-        return installed_version != available_version;
-    }
-
     /*
     void install() {
     }
@@ -220,8 +211,6 @@
     private const string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
     private const string SEARCH_PATH = "api/v1/search?q=%s";
     private const string DETAILS_PATH = "api/v1/package/%s";
-    private const string UPDATES_BASE_URL = "https://myapps.developer.ubuntu.com/";
-    private const string UPDATES_PATH = "dev/api/click-metadata/";
 
     internal Soup.SessionAsync http_session;
 
@@ -234,75 +223,16 @@
         return env_value != null ? env_value : default_value;
     }
 
-    string get_search_base_url () {
+    string get_base_url () {
         return from_environ ("U1_SEARCH_BASE_URL", SEARCH_BASE_URL);
     }
 
     string get_search_url() {
-        return get_search_base_url() + SEARCH_PATH;
+        return get_base_url() + SEARCH_PATH;
     }
 
     string get_details_url() {
-        return get_search_base_url() + DETAILS_PATH;
-    }
-
-    string get_updates_url() {
-        var updates_base_url = from_environ ("U1_UPDATES_BASE_URL", UPDATES_BASE_URL);
-        return updates_base_url + UPDATES_PATH;
-    }
-
-    public async Gee.ArrayList<App> find_updates(Gee.Map<string, App> installed) throws WebserviceError {
-        var needing_update = new Gee.ArrayList<App>();
-        WebserviceError failure = null;
-        var package_ids = installed.keys.to_array();
-        if (package_ids == null) {
-            debug ("package_ids is null, no app installed");
-            return needing_update;
-        }
-
-        var query = "?name=" + string.joinv("&name=", package_ids);
-        string url = get_updates_url() + query;
-        string response = "[]";
-        debug ("find updates url: %s", url);
-
-        var message = new Soup.Message ("GET", url);
-        http_session.queue_message (message, (http_session, message) => {
-            if (message.status_code != Soup.KnownStatusCode.OK) {
-                var msg = "Web request failed: HTTP %u %s".printf(
-                       message.status_code, message.reason_phrase);
-                failure = new WebserviceError.HTTP_ERROR(msg);
-            } else {
-                message.response_body.flatten ();
-                response = (string) message.response_body.data;
-                debug ("response is %s", response);
-            }
-            find_updates.callback ();
-        });
-        yield;
-        if (failure != null) {
-            throw failure;
-        }
-        try {
-            var parser = new Json.Parser();
-            parser.load_from_data(response, -1);
-            var docs = parser.get_root().get_array();
-            foreach (var document in docs.get_elements()) {
-                var object = document.get_object();
-                var package_name = object.get_string_member(JSON_FIELD_NAME);
-                var package_version = object.get_string_member(JSON_FIELD_VERSION);
-                var app = installed.get(package_name);
-                app.uri = App.CLICK_UPDATE_SCHEMA + app.app_id;
-                app.available_version = package_version;
-                if (app.needs_update()) {
-                    needing_update.add (app);
-                }
-            }
-
-            return needing_update;
-        } catch (GLib.Error e) {
-            var msg = "Error parsing json: %s".printf(e.message);
-            throw new WebserviceError.HTTP_ERROR(msg);
-        }
+        return get_base_url() + DETAILS_PATH;
     }
 
     public async AvailableApps search(string query) throws WebserviceError {