Merge lp:~dobey/libubuntuone/update-from-trunk into lp:libubuntuone/stable-3-0

[dobey]

Remove the rescanning of purchased folder on startup to avoid potential race

[Eric Casteleijn (thisfred)]

+1 machete

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[lp:~dobey/libubuntuone/update-from-trunk]

155. By dobey on 2012-04-03

Remove the rescanning of purchased folder on startup to avoid potential race

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuoneui/u1-music-store.c	2012-03-06 21:26:43 +0000
+++ libubuntuoneui/u1-music-store.c	2012-04-03 17:44: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;
 }