Merge lp:~alecu/unity-lens-music/plan-b into lp:unity-lens-music

[Alejandro J. Cura]

Hint the credentials state, so the preview can show it

Hint the credentials state, so the preview can show it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-music-ci/1/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looks reasonable to me, but the UIFe has to be granted before merging this.

review: Approve

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-02-28 09:48:46 +0000
+++ src/musicstore-scope.vala	2013-04-11 16:23:24 +0000
@@ -18,15 +18,19 @@
  */
 
 using GLib;
+using Ubuntuone.Webservice;
 
 namespace Unity.MusicLens {
 
   public class MusicStoreScopeProxy : SimpleScope
   {
+    const string NO_CREDENTIALS_LABEL_TEXT = _("Before you can purchase music you need to log in to the Ubuntu One app");
     private MusicStoreCollection collection;
     private Unity.Extras.PreviewPlayerController preview_player;
     private Unity.MusicPreview? music_preview;
     private PreferencesManager preferences = PreferencesManager.get_default ();
+    private PurchaseService purchase_service;
+    private bool have_credentials = false;
 
     public MusicStoreScopeProxy ()
     {
@@ -41,6 +45,7 @@
       base.initialize ();
 
       collection = new MusicStoreCollection ();
+      purchase_service = new PurchaseService ();
 
       preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
 
@@ -111,12 +116,19 @@
           }
         }
 
-        GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
-        var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
-        if (album.formatted_price != null)
-            download_action.extra_text = album.formatted_price;
-        download_action.activated.connect (download_album);
-        music_preview.add_action (download_action);
+        if (have_credentials) {
+            GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
+            var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
+            if (album.formatted_price != null)
+                download_action.extra_text = album.formatted_price;
+            download_action.activated.connect (download_album);
+            music_preview.add_action (download_action);
+        } else {
+            var data = new HashTable<string, Variant>(str_hash, str_equal);
+            data["no_credentials_label"] = NO_CREDENTIALS_LABEL_TEXT;
+            InfoHint info_hint = new InfoHint.with_variant("music_preview", "", null, data);
+            music_preview.add_info(info_hint);
+        }
       }
       return music_preview;
     }
@@ -142,6 +154,14 @@
       }
 
       try {
+        yield purchase_service.fetch_credentials ();
+        have_credentials = true;
+      } catch (PurchaseError e) {
+        // this is not a serious error, just missing credentials
+        have_credentials = false;
+      }
+
+      try {
 	debug ("model has %u rows before search", search.results_model.get_n_rows ());
 	yield collection.search (search, search_type, (owned) filters, max_results, cancellable);
 	debug ("model has %u rows after search", search.results_model.get_n_rows ());
 
=== modified file 'src/ubuntuone-webservices.vala'
--- src/ubuntuone-webservices.vala	2012-12-06 15:39:38 +0000
+++ src/ubuntuone-webservices.vala	2013-04-11 16:23:24 +0000
@@ -22,7 +22,8 @@
 [DBus (name = "com.ubuntuone.CredentialsManagement")]
 interface CredentialsManagement : GLib.Object {
     public signal void credentials_found (HashTable <string, string> info);
-    public signal void credentials_error ();
+    public signal void credentials_not_found ();
+    public signal void credentials_error (HashTable <string, string> error_dict);
 
     [DBus (name = "find_credentials")]
     public abstract void find_credentials () throws IOError;
@@ -146,7 +147,7 @@
             return payload.get_string_member("open_url");
         }
 
-        internal virtual async void fetch_credentials () throws PurchaseError
+        public virtual async void fetch_credentials () throws PurchaseError
         {
             PurchaseError error = null;
 
@@ -155,7 +156,11 @@
                 debug ("got credentials");
                 fetch_credentials.callback ();
             });
-            ulong error_handler = credentials_management.credentials_error.connect (() => {
+            ulong not_found_handler = credentials_management.credentials_not_found.connect (() => {
+				error = new PurchaseError.PURCHASE_ERROR ("No Ubuntu One tokens.");
+				fetch_credentials.callback ();
+			});
+            ulong error_handler = credentials_management.credentials_error.connect ((error_dict) => {
                 error = new PurchaseError.PURCHASE_ERROR ("Can't get Ubuntu One tokens.");
                 fetch_credentials.callback ();
             });
@@ -168,6 +173,7 @@
             }
 
             credentials_management.disconnect (found_handler);
+            credentials_management.disconnect (not_found_handler);
             credentials_management.disconnect (error_handler);
 
             if (error != null) {
 
=== modified file 'tests/unit/test-ubuntuone-purchases.vala'
--- tests/unit/test-ubuntuone-purchases.vala	2012-12-06 15:39:38 +0000
+++ tests/unit/test-ubuntuone-purchases.vala	2013-04-11 16:23:24 +0000
@@ -210,10 +210,18 @@
 
   class FailingCredentialsManagement : GLib.Object, CredentialsManagement
   {
+    private HashTable <string, string> fake_error_info;
+
+    construct
+    {
+      fake_error_info = new HashTable <string, string> (str_hash, str_equal);
+      fake_error_info["error"] = "fake_error";
+    }
+
     public void find_credentials () throws IOError
     {
       Idle.add (() => {
-        credentials_error ();
+        credentials_error (fake_error_info);
         return false;
       });
     }