tracker r2934 - in trunk: . src/libtracker-common src/tracker-extract

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue Feb 17 09:56:46 2009
New Revision: 2934
URL: http://svn.gnome.org/viewvc/tracker?rev=2934&view=rev

Log:
2009-02-17  Philip Van Hoof  <philip codeminded be>

	* src/tracker-extract/tracker-extract-mp3.c
	* src/tracker-extract/tracker-extract-gstreamer-helix.c
	* src/tracker-extract/tracker-extract-gstreamer.c
	* src/tracker-extract/tracker-extract-albumart.c
	* src/libtracker-common/tracker-albumart.c: Don't add the artist-name
	to the album-art request.



Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-albumart.c
   trunk/src/tracker-extract/tracker-extract-albumart.c
   trunk/src/tracker-extract/tracker-extract-gstreamer-helix.c
   trunk/src/tracker-extract/tracker-extract-gstreamer.c
   trunk/src/tracker-extract/tracker-extract-mp3.c

Modified: trunk/src/libtracker-common/tracker-albumart.c
==============================================================================
--- trunk/src/libtracker-common/tracker-albumart.c	(original)
+++ trunk/src/libtracker-common/tracker-albumart.c	Tue Feb 17 09:56:46 2009
@@ -630,7 +630,8 @@
 		parent = g_file_get_parent (file);
 		local_dir = g_file_get_uri (parent);
 
-		*local_uri = g_strdup_printf ("%s/%s", local_dir, art_filename);
+		/* This is a URI, don't use g_build_filename here */
+		*local_uri = g_strdup_printf ("%s/.mediaartlocal/%s", local_dir, art_filename);
 
 		g_free (local_dir);
 		g_object_unref (file);

Modified: trunk/src/tracker-extract/tracker-extract-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-albumart.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-albumart.c	Tue Feb 17 09:56:46 2009
@@ -148,7 +148,11 @@
 
 			/* If not, we perform a heuristic on the dir */
 
-			if (!tracker_albumart_heuristic (artist, album, trackercnt_str, filename, local_uri, &lcopied)) {
+			if (!tracker_albumart_heuristic (artist, album, 
+			                                 trackercnt_str, 
+			                                 filename, 
+			                                 local_uri, 
+			                                 &lcopied)) {
 
 				/* If the heuristic failed, we request the download 
 				 * of the media-art to the media-art downloaders */

Modified: trunk/src/tracker-extract/tracker-extract-gstreamer-helix.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer-helix.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer-helix.c	Tue Feb 17 09:56:46 2009
@@ -811,13 +811,13 @@
 	if (extractor->album_art_data && extractor->album_art_size) {
 #ifdef HAVE_GDKPIXBUF
 		tracker_process_albumart (extractor->album_art_data, extractor->album_art_size,
-				       g_hash_table_lookup (metadata, "Audio:Artist") ,
+				       /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 				       g_hash_table_lookup (metadata, "Audio:Album"),
 				       g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 				       uri);
 #else
 		tracker_process_albumart (NULL, 0,
-				       g_hash_table_lookup (metadata, "Audio:Artist") ,
+				       /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 				       g_hash_table_lookup (metadata, "Audio:Album"),
 				       g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 				       uri);

Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c	Tue Feb 17 09:56:46 2009
@@ -884,13 +884,13 @@
 	if (extractor->album_art_data && extractor->album_art_size) {
 #ifdef HAVE_GDKPIXBUF
 		tracker_process_albumart (extractor->album_art_data, extractor->album_art_size,
-					  g_hash_table_lookup (metadata, "Audio:Artist") ,
+					  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 					  g_hash_table_lookup (metadata, "Audio:Album"),
 					  g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 					  uri);
 #else
 		tracker_process_albumart (NULL, 0,
-					  g_hash_table_lookup (metadata, "Audio:Artist") ,
+					  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 					  g_hash_table_lookup (metadata, "Audio:Album"),
 					  g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 					  uri);

Modified: trunk/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-mp3.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-mp3.c	Tue Feb 17 09:56:46 2009
@@ -1462,13 +1462,13 @@
 #ifdef HAVE_GDKPIXBUF
 
 	tracker_process_albumart (filedata.albumartdata, filedata.albumartsize,
-				  g_hash_table_lookup (metadata, "Audio:Artist"),
+				  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 				  g_hash_table_lookup (metadata, "Audio:Album"),
 				  g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 				  filename);
 #else
 	tracker_process_albumart (NULL, 0,
-				  g_hash_table_lookup (metadata, "Audio:Artist"),
+				  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
 				  g_hash_table_lookup (metadata, "Audio:Album"),
 				  g_hash_table_lookup (metadata, "Audio:AlbumTrackCount"),
 				  filename);