tracker r2505 - in trunk: . src/tracker-extract

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon Nov 17 13:26:16 2008
New Revision: 2505
URL: http://svn.gnome.org/viewvc/tracker?rev=2505&view=rev

Log:
2008-11-17  Philip Van Hoof  <philip codeminded be>

	* src/tracker-extract/tracker-albumart.c: Also copy in case the
	album art got requested




Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-albumart.c

Modified: trunk/src/tracker-extract/tracker-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-albumart.c	(original)
+++ trunk/src/tracker-extract/tracker-albumart.c	Mon Nov 17 13:26:16 2008
@@ -496,18 +496,31 @@
 	return albart_proxy;
 }
 
+typedef struct {
+	gchar *art_path, *local_uri;
+} GetFileInfo;
+
 static void
 get_file_albumart_queue_cb (DBusGProxy     *proxy,
 			    DBusGProxyCall *call,
 			    gpointer	     user_data)
 {
-	GError *error = NULL;
-	guint	handle;
+	GError      *error = NULL;
+	guint        handle;
+	GetFileInfo *info = user_data;
 
 	dbus_g_proxy_end_call (proxy, call, &error,
 			       G_TYPE_UINT, &handle,
 			       G_TYPE_INVALID);
 
+	if (g_file_test (info->art_path, G_FILE_TEST_EXISTS))
+		perhaps_copy_to_local (info->art_path, info->local_uri);
+
+	g_free (info->art_path);
+	g_free (info->local_uri);
+
+	g_slice_free (GetFileInfo, info);
+
 	if (error) {
 		g_warning ("%s", error->message);
 		g_error_free (error);
@@ -687,14 +700,22 @@
 			/* If not, we perform a heuristic on the dir */
 
 			if (!heuristic_albumart (artist, album, trackercnt_str, filename, local_uri, &lcopied)) {
+				GetFileInfo *info;
 
 				/* If the heuristic failed, we request the download 
 				 * of the media-art to the media-art downloaders */
 
+				lcopied = TRUE;
+
+				info = g_slice_new (GetFileInfo);
+
+				info->local_uri = g_strdup (local_uri);
+				info->art_path = g_strdup (art_path);
+
 				dbus_g_proxy_begin_call (get_albumart_requester (),
 					 "Queue",
 					 get_file_albumart_queue_cb,
-					 NULL, NULL,
+					 info, NULL,
 					 G_TYPE_STRING, artist,
 					 G_TYPE_STRING, album,
 					 G_TYPE_STRING, "album",