Merge lp:~sil/libubuntuone/send-play-signal into lp:libubuntuone

[Stuart Langridge]

Inject JavaScript to allow clicking a song on the library page; when clicked, emit a signal with the song path

[Stuart Langridge (sil)]

Inject JavaScript to allow clicking a song on the library page; when clicked, emit a signal with the song path

[Elliot Murphy (statik)]

review: Approve

[Elliot Murphy (statik)]

The attempt to merge lp:~sil/libubuntuone/send-play-signal into lp:libubuntuone failed.Below is the output from the failed tests.

make: *** No rule to make target `distcheck'. Stop.

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-01-28 15:46:48 +0000
+++ data/Makefile.am	2010-02-17 12:59:14 +0000
@@ -1,6 +1,7 @@
 jsdir = $(U1_JAVASCRIPT_DIR)
 js_DATA =			\
 	u1-library-override.js	\
-	u1-preview.js
+	u1-preview.js	\
+	u1-songs-clickable.js
 
 EXTRA_DIST = $(js_DATA)

=== added file 'data/u1-songs-clickable.js'
--- data/u1-songs-clickable.js	1970-01-01 00:00:00 +0000
+++ data/u1-songs-clickable.js	2010-02-17 12:59:14 +0000
@@ -0,0 +1,10 @@
+(function(){
+	var songs = document.querySelectorAll("#downloads li div.metadata");
+	for (var i=0; i<songs.length; i++) {
+		songs[i].onclick = function(){
+			var dp = this.parentNode.getAttribute("data-path")
+			window.status = "u1playlibrary:::" + dp;
+			return false;
+		}
+	}
+})()

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2010-02-15 15:50:53 +0000
+++ libubuntuone/u1-music-store.c	2010-02-17 12:59:14 +0000
@@ -50,6 +50,7 @@
 
 enum {
 	PREVIEW_MP3_SIGNAL,
+	PLAY_LIBRARY_SIGNAL,
 	LAST_SIGNAL
 };
 
@@ -88,6 +89,15 @@
 								   _u1_marshal_VOID__STRING_STRING,
 								   G_TYPE_NONE, 2,
 								   G_TYPE_STRING, G_TYPE_STRING);
+	u1_music_store_signals[PLAY_LIBRARY_SIGNAL] = g_signal_new ("play-library",
+								   G_TYPE_FROM_CLASS (klass),
+								   (GSignalFlags) G_SIGNAL_RUN_LAST,
+								   G_STRUCT_OFFSET (U1MusicStoreClass, play_library),
+								   NULL,
+								   NULL,
+								   _u1_marshal_VOID__STRING_STRING,
+								   G_TYPE_NONE, 1,
+								   G_TYPE_STRING);
 	object_class->finalize = u1_music_store_finalize;
 }
 
@@ -412,8 +422,12 @@
 
 	/* If the URL just loaded is the library page, update download status */
 	tmp_url = g_strdup_printf ("%s%s", music_store->priv->base_url, U1_LIBRARY_URL);
-	if (g_str_has_prefix (webkit_web_view_get_uri (web_view), tmp_url))
+	if (g_str_has_prefix (webkit_web_view_get_uri (web_view), tmp_url)) {
 		update_status_in_library_page (web_view, frame);
+		/* Inject JavaScript to make songs clickable */
+		execute_script (web_view, "u1-songs-clickable.js", NULL);
+
+	}
 
 	g_free (tmp_url);
 }
@@ -432,6 +446,15 @@
 			g_strfreev (args);
 		}
 	}
+	if (g_str_has_prefix (text, "u1playlibrary:::")) {
+		gchar **args;
+
+		args = g_strsplit (text, ":::", 2);
+		if (args != NULL) {
+			g_signal_emit (music_store, u1_music_store_signals[PLAY_LIBRARY_SIGNAL], 0, args[1]);
+			g_strfreev (args);
+		}
+	}
 }
 
 static gboolean

=== modified file 'libubuntuone/u1-music-store.h'
--- libubuntuone/u1-music-store.h	2009-12-21 13:09:23 +0000
+++ libubuntuone/u1-music-store.h	2010-02-17 12:59:14 +0000
@@ -45,6 +45,7 @@
 
 	/* Signals */
 	void (* preview_mp3) (U1MusicStore *music_store, const gchar *url, const gchar *title);
+	void (* play_library) (U1MusicStore *music_store, const gchar *path);
 } U1MusicStoreClass;
 
 GType      u1_music_store_get_type (void);