Merge lp:~dobey/libubuntuone/boy-racer into lp:libubuntuone

[dobey]

Remove the rescanning of purchased folder on startup to prevent a race condition

This removes the rescanning of the purchased music folder on start-up, as the increased disk i/o it causes, seems to result in a race condition where the URL is not getting properly signed, causing an auth failure, which results in the token getting removed from the keyring, and the odd error of the token not existing, which actually did exist a few seconds ago when it was queried last, when rhythmbox is being started with a u1ms:// URL passed to it, when not already running.

[lp:~dobey/libubuntuone/boy-racer]

150. By dobey on 2012-04-02

Revert extraneous change

[Eric Casteleijn (thisfred)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuoneui/u1-music-store.c	2012-03-06 21:10:59 +0000
+++ libubuntuoneui/u1-music-store.c	2012-04-02 17:30:25 +0000
@@ -1151,67 +1151,6 @@
 					    syncdaemon_folder_info_get_volume_id (folder_info));
 }
 
-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 gboolean
 _u1_music_store_delayed_init (gpointer user_data)
 {
@@ -1222,9 +1161,6 @@
 	folder_info = syncdaemon_daemon_get_folder_info (music_store->priv->syncdaemon, u1_music_store_get_library_location (music_store));
 	music_store->priv->folder_subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
 
-	/* Rescan the purchased music folder */
-	_u1_music_store_rescan_purchased_folder (music_store);
-
 	return FALSE;
 }