1
=== modified file 'data/nuvolaplayer/services/eighttracks/integration.js'
2
--- data/nuvolaplayer/services/eighttracks/integration.js	2012-08-28 15:42:51 +0000
3
+++ data/nuvolaplayer/services/eighttracks/integration.js	2013-02-26 15:23:23 +0000
4
@@ -1,6 +1,7 @@
5
1
/*
1
/*
6
2
 * Copyright 2011-2012 Janez Troha <janez.troha@gmail.com>
2
 * Copyright 2011-2012 Janez Troha <janez.troha@gmail.com>
7
3
 * Copyright 2011-2012 Jiří Janoušek <janousek.jiri@gmail.com>
3
 * Copyright 2011-2012 Jiří Janoušek <janousek.jiri@gmail.com>
8
4
 * Copyright 2013 Michael J Coyne <mikeycgto@gmail.com>
9
4
 *
5
 *
10
5
 * Redistribution and use in source and binary forms, with or without
6
 * Redistribution and use in source and binary forms, with or without
11
6
 * modification, are permitted provided that the following conditions are met: 
7
 * modification, are permitted provided that the following conditions are met: 
12
@@ -24,14 +25,21 @@
13
24
 */
25
 */
14
25
26
15
26
/* Anonymous function is used not to pollute environment */
27
/* Anonymous function is used not to pollute environment */
19
27
(function(Nuvola){
28
(function(Nuvola, $j){
20
28
	
29
	if (!$j) return alert("Unable to find window.jQuery");
21
29
	var get_play_button = function(){
30
22
31
	function get_play_button(){
23
30
		var play_button = $j('#player_play_button');
32
		var play_button = $j('#player_play_button');
26
31
		if(play_button.length == 0) play_button = $j('#play_page span');
33
27
32
		if(play_button.length == 0) play_button = null;
34
		if (play_button.length == 0) play_button = $j('#play_page span');
28
35
		if (play_button.length == 0) play_button = null;
29
36
30
33
		return play_button;
37
		return play_button;
31
34
	}
38
	}
32
39
33
40
	function get_favorite_button(){
34
41
		return $('#like_button');
35
42
	}
36
35
	
43
	
37
36
	/**
44
	/**
38
37
	 * Creates 8tracks integration binded to Nuvola JS API
45
	 * Creates 8tracks integration binded to Nuvola JS API
39
@@ -39,117 +47,87 @@
40
39
	 */
47
	 */
41
40
	var Integration = function(){
48
	var Integration = function(){
42
41
		/* Overwrite default commnad function */
49
		/* Overwrite default commnad function */
46
42
		Nuvola.command = Nuvola.bind(this, this.command);
50
		Nuvola.onMessageReceived = Nuvola.bind(this, this.messageHandler);
47
43
		
51
48
44
		/* For debug output */
52
		// We can never go back in 8tracks
49
53
		Nuvola.updateAction(Nuvola.ACTION_PREV_SONG, false);
50
54
51
45
		this.name = "8tracks";
55
		this.name = "8tracks";
52
46
		
53
47
		/* Let's run */
54
48
		this.state = Nuvola.STATE_NONE;
56
		this.state = Nuvola.STATE_NONE;
55
57
56
49
		this.update();
58
		this.update();
57
50
		// Periodically update state
58
51
		this.timeout = setInterval(Nuvola.bind(this, this.update), 500);
59
52
	};
59
	};
60
53
60
61
54
	/**
61
	/**
62
55
	 * Updates current playback state
62
	 * Updates current playback state
63
56
	 */
63
	 */
64
57
	Integration.prototype.update = function(){
64
	Integration.prototype.update = function(){
119
58
		
65
		var meta   = $('#play_area');
120
59
		var album = null;
66
		var song   = meta.find('.t').text();
121
60
		var album_art = null;
67
		var artist = meta.find('.a').text();
122
61
		var artist = null;
68
		var album  = meta.find('.album .detail').text();
123
62
		var song = null;
69
		var ab_art = meta.find('.cover').attr('src') || null;
124
63
		var state = Nuvola.STATE_NONE;
70
125
64
		var can_prev = false;
71
		var play_button = $j('#player_play_button');
126
65
		var can_next = false;
72
		var pause_button = $j('#player_pause_button');
127
66
		var can_thumbs_up = false;
73
		
128
67
		var can_thumbs_down = false;
74
		if (play_button.css('display') != "none"){
129
68
		var can_favorite = $("#profile_link").length != 0;
75
			this.state = Nuvola.STATE_PAUSED;
130
69
		
76
		} else if (pause_button.css('display') != "none"){
131
70
		try{
77
			this.state = Nuvola.STATE_PLAYING;
132
71
			song = $(".track.now_playing .t").text();
78
		} else {
133
72
			album = $(".track.now_playing .album .detail").text();
79
			this.state = Nuvola.STATE_NONE;
134
73
			artist = $(".track.now_playing .a").text();
80
		}
135
74
			album_art = $("#play_area .cover")[0].src;
81
136
75
			can_next = true; // FIXME
82
		var can_fav  = !!get_favorite_button().length;
137
76
			
83
		var can_next = true;
138
77
		}
84
139
78
		catch(e){
85
		// Update song information
140
79
			//alert("Unable to grab info:" + e.message);
86
		Nuvola.updateSong(song, artist, album, ab_art, this.state);
141
80
		}
87
142
81
		try{	
88
		// Update actions
143
82
			var play_button = $j('#player_play_button');
89
		Nuvola.updateAction(Nuvola.ACTION_FAVORITE, can_fav);
144
83
			play_button = play_button.length == 0 
90
		Nuvola.updateAction(Nuvola.ACTION_NEXT_SONG, can_next);
145
84
				? null : play_button[0];
91
146
85
			
92
		// Callback in 500ms
147
86
			//~ if(! play_button){
93
		setTimeout(Nuvola.bind(this, this.update), 500);
94
87
				//~ play_button = $j('#play_page');
95
88
			//~ play_button = play_button.length == 0 
96
89
				//~ ? null : play_button[0];
97
90
			//~ }
98
91
			
99
92
			var pause_button = $j('#player_pause_button');
100
93
			pause_button = pause_button.length == 0 
101
94
				? null : pause_button[0];
102
95
			
103
96
			if(play_button && play_button.style.display != "none"){
104
97
				state = Nuvola.STATE_PAUSED;
105
98
			}
106
99
			else if(pause_button && pause_button.style.display != "none"){
107
100
				state = Nuvola.STATE_PLAYING;
108
101
			}
109
102
		}
110
103
		catch(e){
111
104
			alert("Unable to grab state: " + e.message);
112
105
		}
113
106
		
114
107
		this.state = state;
115
108
		Nuvola.dataChanged(
116
109
			song, artist, album, album_art,
117
110
			state, can_prev, can_next,
118
111
			can_thumbs_up, can_thumbs_down, can_favorite);
148
112
	}
94
	}
151
113
	
95
150
114
	
152
115
	/**
96
	/**
154
116
	 * Command handler
97
	 * Message Handler
155
117
	 * @param cmd command to execute
98
	 * @param cmd command to execute
156
118
	 */
99
	 */
162
119
	Integration.prototype.command = function(cmd){
100
	Integration.prototype.messageHandler = function(cmd){
163
120
		try{
101
		switch(cmd){
164
121
			console.log(this.name + ": " + cmd + ", " + this.state);
102
			case Nuvola.ACTION_PAUSE:
160
122
			switch(cmd){
161
123
			case Nuvola.CMD_PAUSE:
165
124
				if(this.state == Nuvola.STATE_PLAYING)
103
				if(this.state == Nuvola.STATE_PLAYING)
167
125
					window.$j('#player_play_button').trigger('click');
104
					$j('#player_play_button').trigger('click');
168
126
				break;
105
				break;
170
127
			case Nuvola.CMD_PLAY:
106
171
107
			case Nuvola.ACTION_PLAY:
172
128
				if(this.state != Nuvola.STATE_PLAYING)
108
				if(this.state != Nuvola.STATE_PLAYING)
174
129
					window.$j('#player_play_button').trigger('click');
109
					$j('#player_play_button').trigger('click');
175
130
				break;
110
				break;
177
131
			case Nuvola.CMD_TOGGLE:
111
178
112
			case Nuvola.ACTION_TOGGLE_PLAY:
179
132
				get_play_button().trigger('click');
113
				get_play_button().trigger('click');
180
133
				break;
114
				break;
187
134
			case Nuvola.CMD_NEXT_SONG:
115
188
135
				window.$j('#player_skip_button').trigger('click');
116
			case Nuvola.ACTION_NEXT_SONG:
189
136
				break;
117
				$j('#player_skip_button').trigger('click');
190
137
			case Nuvola.CMD_FAVORITE:
118
				break;
191
138
				window.$j('#like_button input[type="submit"]').trigger("click");
119
192
139
				break;
120
			case Nuvola.ACTION_FAVORITE:
193
121
				get_favorite_button().trigger('click');
194
122
195
140
			default:
123
			default:
210
141
				// Other commands are not supported
124
				throw this.name + ': Action not supported';
211
142
				throw {"message": "Not supported."};
125
212
143
			}
126
			console.log(this.name + ": command '" + cmd + "' executed.");
213
144
			console.log(this.name + ": comand '" + cmd + "' executed.");
127
		}
214
145
		}
128
	};
215
146
		catch(e){
129
216
147
			// API expects exception to be a string
130
	Nuvola.integration = new Integration();
217
148
			throw (this.name + ": " + e.message);
131
218
149
		}
132
})(this, window.jQuery);
205
150
	}
206
151
	
207
152
	
208
153
 Nuvola.integration = new Integration(); // Singleton ;-)
209
154
})(window._Nuvola);
219
155
133
220
156
134
221
=== modified file 'data/nuvolaplayer/services/eighttracks/metadata.conf'
222
--- data/nuvolaplayer/services/eighttracks/metadata.conf	2012-07-31 13:51:32 +0000
223
+++ data/nuvolaplayer/services/eighttracks/metadata.conf	2013-02-26 15:23:23 +0000
224
@@ -1,8 +1,9 @@
225
1
name = 8tracks
1
name = 8tracks
226
2
home_page = http://8tracks.com/
2
home_page = http://8tracks.com/
227
3
sandbox_pattern = https?://8tracks.com/
3
sandbox_pattern = https?://8tracks.com/
231
4
maintainer_name = Orphaned service
4
maintainer_name = Michael J Coyne
232
5
maintainer_link = https://answers.launchpad.net/nuvola-player/+faq/2012
5
maintainer_link = https://launchpad.net/~mikeycgto
233
6
version = 3
6
version = 4
234
7
version_minor = 0
7
version_minor = 0
235
8
api_major= 2
236
8
flash_plugin = no
9
flash_plugin = no
Reviewer	Review Type	Date Requested	Status
Jiří Janoušek		2013-02-16	Approve on 2013-02-26
Review via email: mp+148889@code.launchpad.net