Merge lp:~mims-michael/nuvola-player/amazon into lp:nuvola-player/2.5.x

[Michael Mims]

I don't know if there is a need/want for this, but I use Amazon Cloud Player frequently so I've created a service integration module for it. You certainly don't have to use it, but I thought I would share it with you. I've been using it for a little over a day and it seems to be working fine.

[Jiří Janoušek (fenryxo)]

Thanks for your work, it's certainly valuable contribution to the project. Code looks good (1 minor improvement and 1 cosmetic stuff).

--------8<-----------

66 + var state = Nuvola.STATE_NONE;
90 + var state = Nuvola.STATE_NONE;

The second assignment is unnecessary.

--------8<-----------

78 + var __meta
91 + var __widgets
121 + var __player

Is there any reason to use "__" prefix? (You can leave it as is if it's your personal preference.)

--------8<-----------

175 - var i = uri.last_index_of_char('/');
176 - var id = uri.substring(i+1);
177 + var id = Checksum.compute_for_string(ChecksumType.MD5, uri);

I will revert this change, because it will be merged as a separate patch.

review: Needs Fixing

[lp:~mims-michael/nuvola-player/amazon]

351. By Michael Mims on 2012-04-26

Removed duplicate state declarations. Removed '__' variable prefixes.

Unmerged revisions

=== added directory 'data/nuvolaplayer/services/amazon'
=== added file 'data/nuvolaplayer/services/amazon/description.html'
--- data/nuvolaplayer/services/amazon/description.html	1970-01-01 00:00:00 +0000
+++ data/nuvolaplayer/services/amazon/description.html	2012-04-26 14:45:23 +0000
@@ -0,0 +1,9 @@
+<p><strong>Amazon Cloud Player</strong> is integrated with the MP3 store and allows 
+users to store their music on Amazon Cloud Drive, and play that music from any 
+supported web browsers. Currently, Amazon Cloud Player is available on the website 
+and within the Amazon MP3 Android application.
+</p><p>
+<em>Source:
+<a href="http://http://en.wikipedia.org/wiki/Amazon_MP3">Amazon MP3 on Wikipedia</a>,
+<a href="http://www.amazon.com">Official website</a></em>
+</p>

=== added file 'data/nuvolaplayer/services/amazon/integration.js'
--- data/nuvolaplayer/services/amazon/integration.js	1970-01-01 00:00:00 +0000
+++ data/nuvolaplayer/services/amazon/integration.js	2012-04-26 14:45:23 +0000
@@ -0,0 +1,135 @@
+/*
+	Nuvola Player :: Cloud music integration
+	
+	This script provides integration of the Amazon cloud player streaming service
+	on the JavaScript side. It's executed when Amazon page is completely
+	loaded.
+
+
+	Copyright 2012 Michael Mims <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Anonymous function is used not to pollute environment */
+(function(Nuvola){
+	/**
+	 * Creates Amazon integration binded to Nuvola JS API
+	 */
+	var Integration = function(){
+		/* Overwrite default commnad function */
+		Nuvola.command = Nuvola.bind(this, this.command);
+		
+		/* For debug output */
+		this.name = "Amazon";		
+		
+		/* Let's run */
+		this.state = Nuvola.STATE_NONE;
+		this.update();
+		this.timeout = setInterval(Nuvola.bind(this, this.update), 500);
+	};
+	
+	/**
+	 * Updates current playback state
+	 */
+	Integration.prototype.update = function(){
+		// Default state
+		var state = Nuvola.STATE_NONE;
+		var album = null;
+		var album_art = null;
+		var artist = null;
+		var song = null;
+		var can_prev;
+		var can_next;
+		var can_thumbs_up = false;
+		var can_thumbs_down = false;
+		var can_favorite = false;
+			
+		try{
+			var meta = window.amznMusic.widgets.queueManager.getCurrent().metadata;
+			
+			album = meta.albumName;
+			album_art = meta.albumCoverImageSmall;
+			artist = meta.albumArtistName;
+			song = meta.title;			
+		}
+		catch(e){
+			//~ console.debug("Unable to obtain song info: " + e.message);
+		}
+		
+		try{
+			var widgets = window.amznMusic.widgets;
+			state = widgets.player.isPlaying() ? Nuvola.STATE_PLAYING : Nuvola.STATE_PAUSED;
+			
+			if(state != Nuvola.STATE_NONE){
+				can_prev = widgets.queueManager.hasPrevious();
+				can_next = widgets.queueManager.hasNext();
+			}
+			else{
+				can_prev = can_next = false;
+			}
+			
+		}
+		catch(e){
+			can_prev = can_next = false;
+		}
+
+		this.state = state;
+		
+		// Submit data to Nuvola backend
+		Nuvola.dataChanged(
+			song, artist, album, album_art,
+			state, can_prev, can_next,
+			can_thumbs_up, can_thumbs_down, can_favorite);
+	}
+	
+	/**
+	 * Command handler
+	 * @param cmd command to execute
+	 */
+	Integration.prototype.command = function(cmd){
+		var player = window.amznMusic.widgets.player;
+		try{
+			switch(cmd){
+			case Nuvola.CMD_PLAY:
+				if(this.state != Nuvola.STATE_PLAYING) player.playHash("play/togglePlay", "");
+				break;
+			case Nuvola.CMD_PAUSE:
+				player.pause();
+				break;
+			case Nuvola.CMD_TOGGLE:
+				player.playHash("play/togglePlay", "");
+				break;
+			case Nuvola.CMD_PREV_SONG:
+				player.playHash("play/previous", "");
+				break;
+			case Nuvola.CMD_NEXT_SONG:
+				player.playHash("play/next", "");
+				break;
+			default:
+				// Other commands are not supported
+				throw {"message": "Not supported."};
+			}
+			console.log(this.name + ": comand '" + cmd + "' executed.");
+		}
+		catch(e){
+			// API expects exception to be a string!
+			throw (this.name + ": " + e.message);
+		}
+	}
+
+	/* Store reference */ 
+	Nuvola.integration = new Integration(); // Singleton
+	
+// Call anonymous function with Nuvola object as an argument
+})(window._Nuvola);

=== added file 'data/nuvolaplayer/services/amazon/metadata.conf'
--- data/nuvolaplayer/services/amazon/metadata.conf	1970-01-01 00:00:00 +0000
+++ data/nuvolaplayer/services/amazon/metadata.conf	2012-04-26 14:45:23 +0000
@@ -0,0 +1,6 @@
+name = Amazon
+home_page = http://www.amazon.com/gp/dmusic/mp3/player
+sandbox_pattern = https?://((www\.)?amazon\.com/ap/signin|(www\.)?amazon\.com/gp/dmusic/mp3/player)
+maintainer_name = Michael Mims	
+maintainer_link = https://launchpad.net/~mims-michael
+version = 1

=== modified file 'src/core/storage.vala'
--- src/core/storage.vala	2012-03-21 22:29:37 +0000
+++ src/core/storage.vala	2012-04-26 14:45:23 +0000
@@ -43,8 +43,7 @@
 		public string? get_album_art(string? uri){
 			if(uri == null) return null;
 			/* Album art is stored locally to be passed to libnotify and Sound menu */
-			var i = uri.last_index_of_char('/');
-			var id = uri.substring(i+1);
+			var id = Checksum.compute_for_string(ChecksumType.MD5, uri);
 			var f = this.get_default_cache_file(ALBUM_ART_DIRNAME + "/" + id + ".jpg");
 			if(f.query_exists(null)){
 				return f.get_path();