Merge lp:~alecu/unity-scope-click/architecture-in-search into lp:unity-scope-click

[Alejandro J. Cura]

Send the device architecture in the click search query

PLEASE NOTE: this branch depends on a new server feature, so it must not be landed until the server is fixed. Contact alecu or jayteeuk for more info.

NOTE 2: the server fix has landed, so this branch is ready to land.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://10.97.0.26:8080/job/unity-scope-click-ci/91/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-amd64-ci/91
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-armhf-ci/85

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/91/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'src/click-interface.vala'
--- src/click-interface.vala	2013-10-01 15:29:10 +0000
+++ src/click-interface.vala	2013-10-04 20:12:27 +0000
@@ -21,6 +21,20 @@
 
 public class ClickInterface : GLib.Object {
     const string ARG_DESKTOP_FILE_HINT = "--desktop_file_hint";
+    private static string arch = null;
+
+    public static string get_arch () {
+        if (arch == null) {
+            try {
+                string standard_output;
+                Process.spawn_command_line_sync ("dpkg --print-architecture", out standard_output);
+                arch = standard_output.strip();
+            } catch (SpawnError e) {
+                error("Error starting dpkg: %s", e.message);
+            }
+        }
+        return arch;
+    }
 
     public string get_click_id (string full_app_id) {
         return full_app_id.split("_")[0];

=== modified file 'src/click-webservice.vala'
--- src/click-webservice.vala	2013-10-03 17:40:19 +0000
+++ src/click-webservice.vala	2013-10-04 20:12:27 +0000
@@ -240,6 +240,7 @@
     private const string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
     private const string SEARCH_PATH = "api/v1/search?q=%s";
     private const string SUPPORTED_FRAMEWORKS = "framework:ubuntu-sdk-13.10";
+    private const string ARCHITECTURE = "architecture:";
     private const string DETAILS_PATH = "api/v1/package/%s";
 
     internal Soup.SessionAsync http_session;
@@ -258,7 +259,8 @@
     }
 
     string get_search_url() {
-        return get_base_url() + SEARCH_PATH + "," + SUPPORTED_FRAMEWORKS;
+        return get_base_url() + SEARCH_PATH + "," + SUPPORTED_FRAMEWORKS + "," +
+               ARCHITECTURE + ClickInterface.get_arch();
     }
 
     string get_details_url() {

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-09-25 21:18:19 +0000
+++ src/test-click-webservice.vala	2013-10-04 20:12:27 +0000
@@ -182,6 +182,17 @@
         }
     }
 
+    public static void test_click_architecture ()
+    {
+        try {
+            var arch = ClickInterface.get_arch();
+            debug("Got arch: %s", arch);
+            assert_cmpint (arch.length, OperatorType.GREATER_THAN, 1);
+        } catch (GLib.Error e) {
+            assert_not_reached ();
+        }
+    }
+
     public static void test_click_get_versions ()
     {
         MainLoop mainloop = new MainLoop ();
@@ -256,6 +267,7 @@
     public static int main (string[] args)
     {
         Test.init (ref args);
+        Test.add_data_func ("/Unit/ClickChecker/Test_Click_Architecture", test_click_architecture);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Get_Versions", test_click_get_versions);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Interface", test_click_interface);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Get_DotDesktop", test_click_get_dotdesktop);