Merge lp:~janez-troha/nuvola-player/8tracks into lp:nuvola-player/2.5.x

[dz0ny]

Hi, I've integrated 8tracks.com service, but had to modify the switch service GUI slightly.

[Jiří Janoušek (fenryxo)]

Thanks for your contribution to the Nuvola Player!

review: Approve

=== added file 'data/google-music-frame/images/8tracks.jpg'
Binary files data/google-music-frame/images/8tracks.jpg	1970-01-01 00:00:00 +0000 and data/google-music-frame/images/8tracks.jpg	2011-11-19 12:08:23 +0000 differ
=== added file 'data/google-music-frame/scripts/eighttracks.js'
--- data/google-music-frame/scripts/eighttracks.js	1970-01-01 00:00:00 +0000
+++ data/google-music-frame/scripts/eighttracks.js	2011-11-19 12:08:23 +0000
@@ -0,0 +1,233 @@
+/*
+8tracks.com
+
+Copyright 2011 Janez Troha <[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/>.
+*/
+
+(function(main_obj){
+
+var hasClass = function(elm, klass){
+	var classes = elm.className.split(" ");
+    for(var j=0; j < classes.length; j++){
+		console.log(classes[j]);
+        if(classes[j] == klass) return true;
+     }
+     return false;
+}	
+	
+var toArray = function(obj) {
+    return Array.prototype.slice.call(obj);
+}
+
+var gmf_bind = function(scope, fn) {
+    return function () {
+        return fn.apply(scope, toArray(arguments));
+    };
+}
+
+
+
+/* used to propagate exception to main program */
+var $throw_exception = function(message){
+	console.log("GMF::exception::" + message);
+}
+
+try{
+	/*
+	 * WebKit.WebView.console_message signal doesn't provide 
+	 * debug/error/warn flag for console.debug/error/warn().
+	 * Therefore we use these wrappers.
+	 */
+	var $log_debug = function(message){
+		console.log("GMF::debug::" + message);
+	}
+	
+	var $log_info = function(message){
+		console.log("GMF::info::" + message);
+	}
+	
+	var $log_warn = function(message){
+		console.log("GMF::warn::" + message);
+	}
+	
+	var $log_error = function(message){
+		console.log("GMF::error::" + message);
+	}
+	
+	
+	var $GMF = function(){
+		this.SEPARATOR = "§#@!@#§";
+		this.changed_callbacks = [];
+		this.album_art = null;
+		this.artist = null;
+		this.song = null;
+		this.state = "none";
+		this.can_prev = false;
+		this.can_next = false;
+		this.timeout = null;
+		this.iframe = document.createElement("iframe");
+		this.iframe.name = "GMF_iframe";
+		this.iframe.style.display = "none";
+		document.body.appendChild(this.iframe);
+		var foo = gmf_bind(this, this.saveState);
+		this.changed_callbacks.push(foo);
+		this.update();
+		this.timeout = setInterval(gmf_bind(this, this.setCallback), 500);
+	};
+	
+	$GMF.prototype.setCallback = function(){
+		try{
+			this.update(window.player.set);
+			//clearInterval(this.timeout);
+		}
+		catch(e){
+			
+		}
+	}
+	
+	$GMF.prototype.update = function(current_song){
+		$log_debug("Current song: " + current_song);
+		if(!current_song){
+			try{
+				current_song = window.player.set;
+			}
+			catch(e){
+				console.log(e.message);
+			}
+		}
+		if(!current_song) return;
+		
+		var album_art = null;
+		var artist = null;
+		var song = null;
+		var state = null;
+		try{
+			var info = current_song.track;
+			if(info){
+				song = info.name;
+				album = info.release_name;
+				artist = info.performer;
+				album_art = window.mix.cover_urls.sq133;
+				this.can_next = current_song.skip_allowed;
+			}
+			
+			if(window.player.is_playing()){
+				state = "playing";
+			}
+			else {
+				state = "paused";
+			}
+			//~ console.log(current_song.status + " " + song + " by " + artist + " from " + album + ": " + album_art);
+		}
+		catch(e){
+			album_art = null;
+			artist = null;
+			song = null;
+			state = null;
+		}
+		
+		var changed = false;
+		if(state !== this.state){
+			this.state = state;
+			changed = true;
+		}
+		if(album_art !== this.album_art){
+			this.album_art = album_art;
+			changed = true;
+		}
+		if(artist !== this.artist){
+			this.artist = artist;
+			changed = true;
+		}	
+		if(song !== this.song){
+			this.song = song;
+			changed = true;
+		}
+		
+		if(changed){
+			this.saveState();
+		}
+		console.log(this.state + ", " + this.can_next + ", " + this.can_prev + ", " + this.album_art + ", " + this.artist + ", " + this.song);
+	}
+	
+	$GMF.prototype.saveState = function(){
+		var state = this.state
+			+ this.SEPARATOR + (this.can_prev ? "true" : "false")
+			+ this.SEPARATOR + (this.can_next ? "true" : "false");
+		if(this.album_art !== null || this.artist !== null || this.song !== null){
+			state += this.SEPARATOR + (this.album_art === null ? "" : this.album_art)
+				+ this.SEPARATOR + (this.artist === null ? "" : this.artist)
+				+ this.SEPARATOR + (this.song === null ? "" : this.song);
+		}
+    
+		var doc = this.iframe.contentDocument;
+		if(doc.title != state) doc.title = state;
+	}
+	
+	$GMF.prototype.command = function(cmd){
+		try{
+			console.log("kaj naj: "+cmd);
+
+			if (cmd == "togglePlayPause") {
+				window.$j('#player_play_button').trigger('click');
+			}
+			if (cmd == "next") {
+				window.$j('#player_skip_button').trigger('click');
+			}
+			
+		}
+		catch(e){
+			$throw_exception(e.message);
+		}
+	}
+	
+	$GMF.prototype._triggerMouseEvent = function(elm, name){
+	    var event = document.createEvent('MouseEvents');
+	    event.initMouseEvent(name, true, true, document.defaultView, 1, 0, 0, 0, 0, false, false, false, false, 0, elm);
+	    elm.dispatchEvent(event);
+	}
+
+	$GMF.prototype._clickOnElement = function(elm){
+	    this._triggerMouseEvent(elm, 'mouseover');
+	    this._triggerMouseEvent(elm, 'mousedown');
+	    this._triggerMouseEvent(elm, 'mouseup');
+	}
+
+	$GMF.prototype.thumbsUp = function(){
+		try{
+			window.Grooveshark.voteCurrentSong(1);
+		}
+		catch(e){
+			$throw_exception(e.message);
+		}
+	}
+
+	$GMF.prototype.thumbsDown = function(){
+	    try{
+			window.Grooveshark.voteCurrentSong(-1);
+		}
+		catch(e){
+			$throw_exception(e.message);
+		}
+	}
+
+	
+	main_obj.$GMF = new $GMF(); // Singleton ;-)
+}
+catch(e){
+	$throw_exception(e.message);
+}
+
+})(window);
\ No newline at end of file

=== added file 'src/8tracks.vala'
--- src/8tracks.vala	1970-01-01 00:00:00 +0000
+++ src/8tracks.vala	2011-11-19 12:08:23 +0000
@@ -0,0 +1,307 @@
+/*
+Google Music Frame :: Frame
+
+Copyright 2011 Jiří Janoušek <[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/>.
+*/
+
+using WebKit;
+using Soup;
+using Gee;
+using Fenryxo;
+using Fenryxo.Logger;
+using Fenryxo.Config;
+using Fenryxo.Path;
+using Fenryxo.Widgets;
+
+namespace GMF.Services{
+	
+	
+	
+	/**
+	 * Frame with Google Music web interface.
+	 * Handles state changes received from WebView and produced by script
+	 * loaded in WebView, console logging, WebView requests, user scripts management, etc.
+	 */
+	public class EightTracks: Service{	
+		/**
+		 * Constructs new Frame for application
+		 * 
+		 * @param app Application object
+		 */
+		public class EightTracks(GMF.Application app, GMF.Frame frame, Storage storage){
+			base(app, frame, storage);
+			this.home_url = "http://8tracks.com/";
+			this.base_url = "8tracks.com";
+			this.id = "eighttracks";
+			this.secure = false;
+			if(this.secure){
+				log_message("Secure connection check is enabled.");
+			}
+			else{
+				log_warning("Secure connection check is disabled.");
+			}
+		}
+		
+		/**
+		 * Loads Google Music home page
+		 */
+		public override void go_home(){
+			var uri = this.home_url;
+			if(this.secure && uri.has_prefix("http://")){
+				uri = "https://" + uri.substring(7);
+				log_message("Redirect to %s", uri);
+			}
+			else if(!this.secure && uri.has_prefix("https://")){
+				uri = "http://" + uri.substring(8);
+				log_message("Redirect to %s", uri);
+			}
+			this.frame.open(uri);
+		}
+		
+		protected override void on_frame_loaded(WebFrame frame){
+			unowned string uri = frame.get_uri();
+			log_debug("Loading scripts for frame with uri: %s", uri ?? "null");
+			/* check frame and its URI to load scripts only
+			 * in Google Music web interface */
+			if(uri == null
+			|| frame != this.frame.get_main_frame()
+			|| (!uri.has_prefix("http://" + this.base_url)
+			 && !uri.has_prefix("https://" + this.base_url))) return;
+			
+			this.frame.load_scripts(this.id);
+		}
+		
+		/**
+		 * Execute Google Music player action
+		 * 
+		 * @param cmd Action
+		 * @throw FrameError on failure
+		 */
+		private void command(string cmd) throws FrameError{
+			log_debug("Frame command %s", cmd);
+			this.frame.execute("$GMF.command('" + cmd + "');");
+		}
+		
+		/**
+		 * Skips to the next track in the tracklist.
+		 * 
+		 * If there is no next track (and endless playback and track repeat are both off),
+		 * playback will be stopped. If playback is paused or stopped, it remains that way.
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void next_song(bool notify=true){
+			try{
+				this.skip_notification = ! notify;
+				this.command("next");
+			}
+			catch(FrameError e){
+				log_critical("Player: nextSong command failed: %s", e.message);
+				if(!notify) this.skip_notification = false;
+			}
+		}
+		
+		/***
+		 * Skips to the previous track in the tracklist.
+		 * 
+		 * If there is no previous track (and endless playback and track repeat are both off),
+		 * playback will be stopped. If playback is paused or stopped, it remains that way.
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void previous_song(bool notify=true){
+			try{
+				this.skip_notification = ! notify;
+				this.command("previous");
+			}
+			catch(FrameError e){
+				log_critical("Player: prevSong command failed: %s", e.message);
+				if(!notify) this.skip_notification = false;
+			}
+		}
+		
+		/**
+		 * Pauses playback.
+		 * 
+		 * If playback is already paused, this has no effect. Calling Play after this should
+		 * cause playback to start again from the same position.
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void pause(bool notify=true){
+			/* No notifications are shown on pause action,
+			 * therefore notify param has no effect
+			 */
+			try{
+				this.command("pause");
+			}
+			catch(FrameError e){
+				log_critical("Player: pauseSong command failed: %s", e.message);
+			}
+		}
+		
+		/**
+		 * Pauses playback.
+		 * If playback is already paused, resumes playback.
+		 * If playback is stopped, starts playback.
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void toggle_play(bool notify=true){
+			try{
+				if(this.playback_state != "playing") this.skip_notification = ! notify;
+				this.command("togglePlayPause");
+			}
+			catch(FrameError e){
+				log_critical("Player: playPause command failed: %s", e.message);
+				if(!notify) this.skip_notification = false;
+			}
+		}
+		
+		/**
+		 * Stops playback.
+		 * 
+		 * If playback is already stopped, this has no effect. Calling Play after this should
+		 * cause playback to start again from the beginning of the track. 
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void stop(bool notify=true){
+			/* No notifications are shown on pause action,
+			 * therefore notify param has no effect
+			 */
+			this.pause(notify);
+		}
+		
+		/**
+		 * Starts or resumes playback.
+		 * 
+		 * If already playing, this has no effect.
+		 * If there is no track to play, this has no effect.
+		 * 
+		 * @param notify if true a notification will be shown if needed
+		 */
+		public override void play(bool notify=true){
+			try{
+				this.skip_notification = ! notify;
+				if(!this.playing) this.command("playPause");
+			}
+			catch(FrameError e){
+				log_critical("Player: playPause command failed: %s", e.message);
+				if(!notify) this.skip_notification = false;
+			}
+		}
+		
+		public override void thumbs_up(bool notify=true){
+			try{
+	//~ 			this.skip_notification = ! notify;
+				this.frame.execute("$GMF.thumbsUp();");
+			}
+			catch(FrameError e){
+				log_critical("Player: thumbUp command failed: %s", e.message);
+	//~ 			if(!notify) this.skip_notification = false;
+			}
+		}
+		
+		public override void thumbs_down(bool notify=true){
+			try{
+	//~ 			this.skip_notification = ! notify;
+				this.frame.execute("$GMF.thumbsDown();");
+			}
+			catch(FrameError e){
+				log_critical("Player: thumbUp command failed: %s", e.message);
+	//~ 			if(!notify) this.skip_notification = false;
+			}
+		}
+				
+		/**
+		 * Open new window in the default web browser
+		 */
+		protected override bool on_new_window(WebFrame frame, NetworkRequest req,
+			WebNavigationAction action, WebPolicyDecision decision){
+			unowned string uri = req.get_uri();
+			log_debug("New window request: %s", uri);
+			
+			if(("accounts.google.com/" in uri)
+				|| ("google.com/accounts" in uri)){
+				this.frame.open(uri);
+			}
+			else{
+				this.open_in_web_browser(uri);
+			}
+			decision.ignore();
+			return true;
+		}
+		
+		/**
+		 * Decide whether open page in frame or in the default browser
+		 */
+		protected override bool on_new_page(WebFrame frame, NetworkRequest req,
+			WebNavigationAction action, WebPolicyDecision decision){
+			string uri = req.get_uri();
+			log_debug("New page request: URI: %s, frame URI: %s",
+				uri, frame.get_uri() ?? "null");
+			
+			if(frame != this.frame.get_main_frame()){
+				// don't care about pages in <iframe> elements
+				return false;
+			}
+			
+			/* Open Flash install page in the default browser */
+			if(uri.has_prefix("http://get.adobe.com/flashplayer")){
+				this.open_in_web_browser(uri);
+				decision.ignore();
+				return true;
+			}
+			
+			
+			
+			
+			/* Open Google services in the default browser (except login page) */
+			if(("google.com" in uri)
+				&& !("music.google.com" in uri)
+				&& !("accounts.google.com/" in uri)
+				&& !("google.com/accounts" in uri)){
+				this.open_in_web_browser(uri);
+				decision.ignore();
+				return true;
+			}
+			
+			if(uri.has_prefix("https://" + this.base_url)
+			|| uri.has_prefix("http://" + this.base_url)){
+				if(this.secure && uri.has_prefix("http://")){
+					// Wanna HTTPS
+					uri = "https://" + uri.substring(7);
+					log_message("Reditect to %s", uri);
+					this.frame.open(uri);
+					decision.ignore();
+					return true;
+				}
+				else{
+					this.app.ui_state[this.id + ".last_uri"] = (owned) uri;
+					try{
+						this.app.ui_state.save();
+					}
+					catch(Error e){
+						log_warning("Unable to save UI state: %s", e.message);
+					}
+						
+				}
+			}
+			return false;
+		}
+	}
+	
+}

=== modified file 'src/application.vala'
--- src/application.vala	2011-11-17 13:46:39 +0000
+++ src/application.vala	2011-11-19 12:08:23 +0000
@@ -105,7 +105,7 @@
 		 */
 		public override void run(){
 			string? service = this.config["service"] ?? "";
-			if(service != "grooveshark" && service != "google-music"){
+			if(service != "grooveshark" && service != "google-music" && service != "eighttracks"){
 				var dialog = new SelectServiceWindow(this, this.storage);
 				service = dialog.get_service();
 				if(service == null){
@@ -229,10 +229,14 @@
 		}
 		
 		private Service load_service(string id){
+			if(id == "eighttracks")
+				return new EightTracks(this, this.frame, this.storage);
 			if(id == "grooveshark")
 				return new Grooveshark(this, this.frame, this.storage);
 			if(id == "google-music")
 				return new GoogleMusic(this, this.frame, this.storage);
+
+
 			assert_not_reached();
 		}
 		

=== modified file 'src/window.vala'
--- src/window.vala	2011-11-17 22:32:22 +0000
+++ src/window.vala	2011-11-19 12:08:23 +0000
@@ -315,7 +315,7 @@
 			table.attach(label, 0, 2, line, line + 1, opt, opt, 15, 15);
 			
 			line++;
-			
+			//Google music start
 			button = new Gtk.Button();
 			button.clicked.connect( () => {
 				this.service = "google-music";
@@ -332,28 +332,8 @@
 				label.use_markup = true;
 				button.add(label);
 			}
-			table.attach(button, 1, 2, line, line + 1, opt, opt, 0, 10);
-			
-			button = new Gtk.Button();
-			button.clicked.connect( () => {
-				this.service = "grooveshark";
-				this.response(ResponseType.OK);
-			});
-			
-			logo_file = Fenryxo.Path.get_data_file(app.app_name + "/images/grooveshark.png");
-			if(logo_file != null){
-				logo = new Gtk.Image.from_file(logo_file.get_path());
-				button.add(logo);
-			}
-			else{
-				label = new Gtk.Label("<big><b>Grooveshark</b></big>");
-				label.use_markup = true;
-				button.add(label);
-			}
 			table.attach(button, 0, 1, line, line + 1, opt, opt, 0, 10);
 			
-			line++;
-			
 			/// '<b>text</b>' makes 'text' bold			
 			string about = _("""<b>Google Music</b> (formerly Music Beta by Google) is an online music streaming service that supports streaming music to desktop browsers and Android phones and tablets. The service is only available through invitation to US residents only. It supports uploading a user's own music and supports buying music at Android Market.
 
@@ -363,7 +343,34 @@
 			label.wrap_mode = Pango.WrapMode.WORD;
 			label.wrap = true;
 			table.attach(label, 1, 2, line, line + 1, opt, opt, 15, 10);
+
+			button = new Gtk.Button.with_label("Use Music by Google");
+			button.clicked.connect( () => {
+				this.service = "google-music";
+				this.response(ResponseType.OK);
+			});			
+			table.attach(button, 2, 3, line, line + 1, opt, opt, 0, 0);
+			line++;
+			//Google music end
+
+			//Grooveshark start
+			button = new Gtk.Button();
+			button.clicked.connect( () => {
+				this.service = "grooveshark";
+				this.response(ResponseType.OK);
+			});
 			
+			logo_file = Fenryxo.Path.get_data_file(app.app_name + "/images/grooveshark.png");
+			if(logo_file != null){
+				logo = new Gtk.Image.from_file(logo_file.get_path());
+				button.add(logo);
+			}
+			else{
+				label = new Gtk.Label("<big><b>Grooveshark</b></big>");
+				label.use_markup = true;
+				button.add(label);
+			}
+			table.attach(button, 0, 1, line, line + 1, opt, opt, 0, 10);
 			/// '<b>text</b>' makes 'text' bold
 			about = _("""<b>Grooveshark</b> is an international online music search engine, music streaming service and music recommendation web software application, allowing users to search for, stream, and upload music that can be played immediately or added to a playlist. An optional paid subscription adds additional functionality and removes advertisements.
 
@@ -372,28 +379,60 @@
 			label.use_markup = true;
 			label.wrap_mode = Pango.WrapMode.WORD;
 			label.wrap = true;
-			table.attach(label, 0, 1, line, line + 1, opt, opt, 15, 10);
-			
-			
-line++;
-			
-			button = new Gtk.Button.with_label("Use Music Beta by Google");
-			button.clicked.connect( () => {
-				this.service = "google-music";
-				this.response(ResponseType.OK);
-			});			
-			table.attach(button, 1, 2, line, line + 1, opt, opt, 0, 0);
+			table.attach(label, 1, 2, line, line + 1, opt, opt, 15, 10);			
+
 			
 			button = new Gtk.Button.with_label("Use Grooveshark");
 			button.clicked.connect( () => {
 				this.service = "grooveshark";
 				this.response(ResponseType.OK);
 			});
-			table.attach(button, 0, 1, line, line + 1, opt, opt, 0, 0);
-			
+			table.attach(button, 2, 3, line, line + 1, opt, opt, 0, 0);
+			line++;
+			//Grooveshark end
+
+			//8Tracks start
+			button = new Gtk.Button();
+			button.clicked.connect( () => {
+				this.service = "eighttracks";
+				this.response(ResponseType.OK);
+			});
+			
+			logo_file = Fenryxo.Path.get_data_file(app.app_name + "/images/8tracks.jpg");
+			if(logo_file != null){
+				logo = new Gtk.Image.from_file(logo_file.get_path());
+				button.add(logo);
+			}
+			else{
+				label = new Gtk.Label("<big><b>8tracks</b></big>");
+				label.use_markup = true;
+				button.add(label);
+			}
+			table.attach(button, 0, 1, line, line + 1, opt, opt, 0, 10);
+			/// '<b>text</b>' makes 'text' bold
+			about = _("""<b>8tracks</b> is a website that fuses elements of internet radio and social networking revolving around the concept of streaming user-curated playlists consisting of at least 8 tracks.
+
+<i>Source: <a href="http://en.wikipedia.org/wiki/8tracks.com">8tracks.com on Wikipedia</a>, <a href="http://8tracks.com">Official website</a></i>""");
+			label = new Gtk.Label(about);
+			label.use_markup = true;
+			label.wrap_mode = Pango.WrapMode.WORD;
+			label.wrap = true;
+			table.attach(label, 1, 2, line, line + 1, opt, opt, 15, 10);			
+
+			
+			button = new Gtk.Button.with_label("Use 8tracks");
+			button.clicked.connect( () => {
+				this.service = "eighttracks";
+				this.response(ResponseType.OK);
+			});
+			table.attach(button, 2, 3, line, line + 1, opt, opt, 0, 0);
+			//8Tracks end
+
 			var content = this.get_content_area() as Gtk.Container;
 			content.add(table);
 			content.show_all();
+		
+			
 		}
 		
 		public string? get_service(){

=== modified file 'wscript'
--- wscript	2011-11-17 13:12:43 +0000
+++ wscript	2011-11-19 12:08:23 +0000
@@ -180,6 +180,7 @@
 		'src/base-service.vala',
 		'src/google-music.vala',
 		'src/grooveshark.vala',
+		'src/8tracks.vala',
 		'src/application.vala',
 		'src/player.vala',
 		'src/mpris.vala',