nuvola-player-devel team mailing list archive

[Michael Mims <mims.michael@xxxxxxxxx>]

Michael Mims has proposed merging lp:~mims-michael/nuvola-player/amazon-prime-fix into lp:nuvola-player.

Requested reviews:
  Jiří Janoušek (fenryxo)
Related bugs:
  Bug #1333906 in Nuvola Player: "Amazon Cloud Player opens site in browser"
  https://bugs.launchpad.net/nuvola-player/+bug/1333906
  Bug #1334022 in Nuvola Player: "Amazon Music prime streaming doesn't work"
  https://bugs.launchpad.net/nuvola-player/+bug/1334022

For more details, see:
https://code.launchpad.net/~mims-michael/nuvola-player/amazon-prime-fix/+merge/224716

Update to Amazon integration that supports Prime music features.
-- 
https://code.launchpad.net/~mims-michael/nuvola-player/amazon-prime-fix/+merge/224716
Your team Nuvola Player Development is subscribed to branch lp:nuvola-player.

=== modified file 'data/nuvolaplayer/services/amazon/integration.js'
--- data/nuvolaplayer/services/amazon/integration.js	2013-12-22 19:59:20 +0000
+++ data/nuvolaplayer/services/amazon/integration.js	2014-06-26 20:11:28 +0000
@@ -77,12 +77,12 @@
 		var can_next;
 			
 		try{
-			var meta = window.amznMusic.widgets.queueManager.getCurrent().metadata;
+			var meta = window.amznMusic.widgets.player.getCurrent().metadata;
 			
 			album = meta.albumName;
-			album_art = meta.albumCoverImageSmall;
-			artist = meta.albumArtistName;
-			song = meta.title;			
+			album_art = meta.albumCoverImageSmall || meta.image;
+			artist = meta.albumArtistName || meta.artistName;
+			song = meta.title;
 		}
 		catch(e){
 			//~ console.debug("Unable to obtain song info: " + e.message);
@@ -111,10 +111,12 @@
 		Nuvola.updateSong(song, artist, album, album_art, state);
 		
 		if(this.can_prev !== can_prev){
+			console.debug("can_prev changed to " + can_prev);
 			this.can_prev = can_prev;
 			Nuvola.updateAction(Nuvola.ACTION_PREV_SONG, can_prev);
 		}
 		if(this.can_next !== can_next){
+			console.debug("can_next changed to " + can_next);
 			this.can_next = can_next;
 			Nuvola.updateAction(Nuvola.ACTION_NEXT_SONG, can_next);
 		}

=== modified file 'data/nuvolaplayer/services/amazon/metadata.conf'
--- data/nuvolaplayer/services/amazon/metadata.conf	2013-12-24 14:23:11 +0000
+++ data/nuvolaplayer/services/amazon/metadata.conf	2014-06-26 20:11:28 +0000
@@ -1,10 +1,10 @@
 name = Amazon Cloud Player
 home_page = service://home.html
-sandbox_pattern = https?://((www\.)?amazon\.(com|fr|de|co\.uk)/(ap/signin|gp/dmusic/(mp3/(player|forceSignIn)|marketing/CloudPlayerLaunchPage)|gp/redirect))|.*/nuvolaplayer/services/amazon/home.html
+sandbox_pattern = https?://((www\.)?amazon\.(com|fr|de|co\.uk)/(ap/signin.*|gp/dmusic/.*|gp/redirect))|https?://.*ssl-images-amazon\..*|file:///.*/amazon/home.html
 maintainer_name = Michael Mims
 maintainer_link = https://launchpad.net/~mims-michael
 version = 4
-version_minor = 3
+version_minor = 4
 api_major = 2
-flash_plugin = no
+flash_plugin = yes