[maemo-commits] [maemo-commits] r16305 - in projects/haf/branches/hildon-thumbnail/daemonize: albumart-providers/googleimages daemon

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-10-01 11:51:20 +0300 (Wed, 01 Oct 2008)
New Revision: 16305

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c
Log:
2008-10-01  Philip Van Hoof  <pvanhoof at gnome.org>

	* daemon/albumart.c: Heuristics for cover art
	* albumart-providers/googleimages/google-images-art-downloader.vala: URI 
	encoding



Modified: projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala	2008-10-01 08:13:44 UTC (rev 16304)
+++ projects/haf/branches/hildon-thumbnail/daemonize/albumart-providers/googleimages/google-images-art-downloader.vala	2008-10-01 08:51:20 UTC (rev 16305)
@@ -44,7 +44,7 @@
 
 		// Start the query on Google images
 
-		File google_search = File.new_for_uri ("http://images.google.com/images?q=" + stitched);
+		File google_search = File.new_for_uri ("http://images.google.com/images?q=" + Uri.escape_string (stitched, "+", false));
 
 		try {
 			char [] buffer = new char [40000];

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c	2008-10-01 08:13:44 UTC (rev 16304)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c	2008-10-01 08:51:20 UTC (rev 16305)
@@ -156,6 +156,51 @@
 	dbus_g_method_return (context, num);
 }
 
+#ifndef strcasestr
+char *
+strcasestr (char *haystack, char *needle)
+{
+	char *p, *startn = 0, *np = 0;
+
+	for (p = haystack; *p; p++) {
+		if (np) {
+			if (toupper(*p) == toupper(*np)) {
+				if (!*++np)
+					return startn;
+			} else
+				np = 0;
+		} else if (toupper(*p) == toupper(*needle)) {
+			np = needle + 1;
+			startn = p;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+static gchar*
+find_image_file_in_for (GDir *dir, gchar *filename) 
+{
+	gchar *retval = NULL;
+	const gchar *item;
+	gsize s = (gsize) strlen (filename);
+
+	while (item = g_dir_read_name (dir)) {
+		if ((s == 0 || g_ascii_strncasecmp (item, filename, s) == 0) && 
+		    (strcasestr ((char *) item, (char *) ".jpeg") || 
+		     strcasestr ((char *) item, (char *) ".jpg") )) 
+		{
+			retval = g_strdup (item);
+			break;
+		}
+	}
+
+	g_dir_rewind (dir);
+
+	return retval;
+}
+
 /* This is the threadpool's function. This means that everything we do is 
  * asynchronous wrt to the mainloop (we aren't blocking it). Because it all 
  * happens in a thread, we must care about proper locking, too.
@@ -187,11 +232,52 @@
 
 	hildon_thumbnail_util_get_albumart_path (artist, album, uri, &path);
 
-
 	if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
 		gboolean handled = FALSE;
+		GFile *file = g_file_new_for_uri (task->uri);
+		gchar *dpath = g_file_get_path (file);
 
 		// TODO: Perform copy from embedded (in uri) to path
+
+		g_object_unref (file);
+
+		if (dpath) {
+			gchar *dirn = g_path_get_dirname (dpath);
+			GDir *dir = g_dir_open (dirn, 0, NULL);
+
+			if (dir) {
+				gchar *image;
+
+				image = find_image_file_in_for (dir, album);
+				if (!image)
+					image = find_image_file_in_for (dir, artist);
+				if (!image)
+					image = find_image_file_in_for (dir, "cover");
+				if (!image)
+					image = find_image_file_in_for (dir, "front");
+				if (!image)
+					image = find_image_file_in_for (dir, "album");
+				if (!image)
+					image = find_image_file_in_for (dir, "");
+
+				if (image) {
+					GFile *image_file = g_file_new_for_path (image);
+					GFile *cache_file = g_file_new_for_path (path);
+					g_file_copy (image_file, cache_file, 
+						     G_FILE_COPY_NONE, 
+						     NULL, NULL, NULL, NULL);
+					handled = TRUE;
+					g_object_unref (image_file);
+					g_object_unref (cache_file);
+					g_free (image);
+				}
+
+				g_dir_close (dir);
+			}
+			g_free (dirn);
+			g_free (dpath);
+		}
+		
 		// TODO: Perform heuristics from uri to path
 
 		if (!handled) {