Merge lp:~mandel/unity-lens-music/design-fixes into lp:~unity-team/unity-lens-music/libunity7-compatible

[Manuel de la Peña]

- Pass the price to the error previews (LP:1179981)
- Fix spawning of the ubuntuone-credentials app (LP:180347)
- Ensure that free songs say are free and do not use a weird price tag (LP:1180717)

Fixed the following bugs according the reviews done by design:

- Pass the price to the error previews (LP:1179981)
- Fix spawning of the ubuntuone-credentials app (LP:180347)
- Ensure that free songs say are free and do not use a weird price tag (LP:1180717)

[Manuel de la Peña (mandel)]

The simplest way to test this changes IRL is to purge the experimenta ppa (just in case) and do the following:

sudo apt-add-repository ppa:ubuntuone/dashpurchase-testing
sudo apt-get update
sudo apt-get install unity-scope-home ubuntuone-credentials
sudo apt-get upgrade

Once you have done that you can log out, log in and try to purchase songs within the dash.

[lp:~mandel/unity-lens-music/design-fixes]

162. By Manuel de la Peña on 2013-05-17

Fixed album price issue.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/21/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Code-wise looks fine. I was only able to test spawning of the ubuntuone-credentials app. +1

review: Approve

=== modified file 'src/album.vala'
--- src/album.vala	2013-03-12 21:16:31 +0000
+++ src/album.vala	2013-05-17 10:15:30 +0000
@@ -20,14 +20,16 @@
 using GLib;
 
 namespace Unity.MusicLens {
- 	
+
   public class Album : GLib.Object
   {
     public string title { get; set; }
     public string artist { get; set; }
     public string uri { get; set; }
     public string artwork_path { get; set; }
+    public double price { get; set; }
     public string formatted_price { get; set; }
     public string purchase_sku { get; set; }
+
   }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/musicstore-collection.vala'
--- src/musicstore-collection.vala	2013-04-17 15:02:43 +0000
+++ src/musicstore-collection.vala	2013-05-17 10:15:30 +0000
@@ -70,6 +70,12 @@
             album.artist = root_obj.get_string_member ("artist");
             album.uri = http_uri;
 
+            // store the price in the album so that we can get the value easily
+            if (root_obj.has_member ("price"))
+            {
+              album.price = double.parse (root_obj.get_string_member ("price"));
+            }
+
             // musicsearch should give us formatted_price, but fallback to price + currency
             if (root_obj.has_member ("formatted_price"))
             {
 
=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-05-09 14:55:40 +0000
+++ src/musicstore-scope.vala	2013-05-17 10:15:30 +0000
@@ -129,8 +129,10 @@
 
         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 ("show_purchase_preview", _("Download"), icon);
-        if (album.formatted_price != null)
+        if (album.price > 0 && album.formatted_price != null)
             download_action.extra_text = album.formatted_price;
+        else if (album.price == 0)
+            download_action.extra_text = _("Free");
         download_action.activated.connect (show_purchase_preview);
         music_preview.add_action (download_action);
       }
@@ -168,7 +170,7 @@
 
     delegate Unity.ActivationResponse LinkHandler (string uri);
 
-    private Unity.ActivationResponse build_error_preview (string uri, string error_header, string link_text, LinkHandler link_handler)
+    private Unity.ActivationResponse build_error_preview (string uri, string error_header, string album_price, string link_text, LinkHandler link_handler)
     {
       Album album = null;
       SList<Track> tracks = null;
@@ -178,6 +180,8 @@
       var cover = new FileIcon (cover_file);
       var error_preview = new Unity.PaymentPreview.for_error(album.title, album.artist, cover);
       error_preview.header = error_header;
+      error_preview.purchase_prize = album_price;
+      error_preview.purchase_type = _("Digital CD");
       var error_action = new Unity.PreviewAction ("open_u1_link", link_text, null);
       error_action.activated.connect (() => link_handler (uri));
       error_preview.add_action (error_action);
@@ -207,24 +211,18 @@
 
       debug ("Finding %s", UBUNTUONE_MUSIC_LOGIN);
       var ui_path = Environment.find_program_in_path (UBUNTUONE_MUSIC_LOGIN);
-      GLib.Pid child_pid;
-      string argv[6] = {
-        ui_path,
-        "--album=" + album.title,
-        "--artist=" + album.artist,
-        "--price=" + album.formatted_price,
-        "--picture=" + album.artwork_path,
-        "--url=" + uri
-      };
+      string cmd_line = "%s --album=\"%s\" --artist=\"%s\" --price=\"%s\" --picture=\"%s\" --url=\"%s\"".printf(
+        ui_path, album.title, album.artist, album.formatted_price, album.artwork_path, uri);
       if (ui_path != null) {
         try {
-          bool was_started = Process.spawn_async (null, argv, null, 0, null, out child_pid);
+          debug ("Executing '%s'", cmd_line);
+          bool was_started = Process.spawn_command_line_async (cmd_line);
           // hide dash
           if (was_started) {
               return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
           }
         } catch (GLib.SpawnError e) {
-          debug ("Failed to start ubuntuone-music-login for uri %s", uri);
+          debug ("Failed to start ubuntuone-music-login for uri %s due to '%s'", uri, e.message);
         }
       }
       return open_uri (uri);
@@ -282,12 +280,13 @@
       if (purchase_service.got_credentials () == false)
       {
         debug ("no credentials available, opening sso login. %s", uri);
-        return build_error_preview (uri, ERROR_MESSAGE_NOT_LOGGED_IN, _("Continue"), open_sso_login);
+        return open_sso_login (uri);
       }
 
       Album album = null;
       SList<Track> tracks = null;
       collection.get_album_details (uri, out album, out tracks);
+
       if (album != null)
       {
         try {
@@ -296,7 +295,7 @@
           return new Unity.ActivationResponse.with_preview (purchase_preview (uri, null));
         } catch (PurchaseError e) {
           debug ("can't get default payment method: %s", e.message);
-          return build_error_preview (uri, ERROR_MESSAGE_NO_PAYMENT_METHOD, _("Choose Payment Method"), change_payment_method);
+          return build_error_preview (uri, ERROR_MESSAGE_NO_PAYMENT_METHOD, album.formatted_price, _("Go to Ubuntu One"), change_payment_method);
         }
       }
       return open_uri (uri);
@@ -346,7 +345,7 @@
             return new Unity.ActivationResponse.with_preview (purchase_preview (uri, _("Wrong password")));
         } else {
             debug ("got purchase error: %s", e.message);
-            return build_error_preview (uri, ERROR_MESSAGE_TECHNICAL_PROBLEM, _("Continue"), open_uri);
+            return build_error_preview (uri, ERROR_MESSAGE_TECHNICAL_PROBLEM, album.formatted_price, _("Continue"), open_uri);
         }
       }
     }