Merge lp:~dobey/libubuntuone/rescan-library into lp:libubuntuone

[dobey]

Rescan the Purchased Music folder asynchronously on startup

To test:

./autogen.sh
make U1_JAVASCRIPT_DIR=`pwd`/data

Copy another mp3 into ~/.ubuntuone/Purchased from Ubuntu One/

LD_PRELOAD=`pwd`/libubuntuone/.libs/libubuntuone-1.0.so.1.0.0 banshee

Switch to the Ubuntu One Music Store source. The song should then appear in the library. The store widget does not get initialized until switching to the source, so a patch to banshee will also be required to make this happen on startup. I have that patch as well and will file it upstream with a requirement on new version of libubuntuone once this branch is landed and I make a release.

[Eric Casteleijn (thisfred)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-04-01 17:19:03 +0000
+++ libubuntuone/u1-music-store.c	2011-04-06 20:50:48 +0000
@@ -1160,6 +1160,67 @@
 }
 
 static void
+_u1_purchased_enumerate (GObject *source, GAsyncResult *result,
+                         gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	GFile *dir = G_FILE (source);
+	GFileEnumerator *files;
+	GFileInfo *info;
+	GError *error = NULL;
+
+	files = g_file_enumerate_children_finish (dir, result, &error);
+
+	if (error != NULL) {
+		g_warning ("Error rescanning Purchased Music: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	while ((info = g_file_enumerator_next_file (files, NULL, NULL)) != NULL) {
+		gchar *path;
+
+		path = g_build_filename (g_file_get_path (dir),
+					 g_file_info_get_name (info),
+					 NULL);
+		if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
+			GFile *subdir = g_file_new_for_path (path);
+			g_file_enumerate_children_async (subdir,
+							 G_FILE_ATTRIBUTE_STANDARD_NAME,
+                                        		 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                        		 G_PRIORITY_DEFAULT, NULL,
+                                        		 (GAsyncReadyCallback) _u1_purchased_enumerate,
+                                        		 music_store);
+		} else if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+			g_signal_emit (music_store,
+				       u1_music_store_signals[DOWNLOAD_FINISHED_SIGNAL], 0,
+                                       (const gchar *) path);
+		}
+
+		g_free (path);
+		g_object_unref (info);
+	}
+	g_file_enumerator_close (files, NULL, NULL);
+	g_object_unref (dir);
+}
+
+static void
+_u1_music_store_rescan_purchased_folder (U1MusicStore *music_store)
+{
+	GFile *dir;
+	const gchar *path;
+
+	path = u1_music_store_get_library_location (music_store);
+	dir = g_file_new_for_path (path);
+	g_file_enumerate_children_async (dir,
+					 G_FILE_ATTRIBUTE_STANDARD_NAME,
+					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+					 G_PRIORITY_DEFAULT, NULL,
+					 (GAsyncReadyCallback) _u1_purchased_enumerate,
+					 music_store);
+}
+
+static void
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
@@ -1293,6 +1354,8 @@
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
 	gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
+
+	_u1_music_store_rescan_purchased_folder (music_store);
 }
 
 /**