# HG changeset patch
# User nenolod
# Date 1150697986 25200
# Node ID a9aba74678fc644ebb59438712300a5fcf706a54
# Parent  ade29d1d53fac4ca809e85076c7b6158de0def7b
[svn] - nemo's patch applied to fileinfo

diff -r ade29d1d53fa -r a9aba74678fc ChangeLog
--- a/ChangeLog	Sun Jun 18 23:06:45 2006 -0700
+++ b/ChangeLog	Sun Jun 18 23:19:46 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-19 06:06:45 +0000  Derek Pomery <nemo@m8y.org>
+  revision [1516]
+  fetch first jpeg/png in directory, hopefully is album image.. merged again, still needs fileinfo, maybe, and undoubtedly tweaking.  but bedtime dammit.
+  
+
+  Changes:        Modified:
+  +34 -10         trunk/audacious/ui_fileinfo.c  
+
+
 2006-06-19 05:36:26 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1514]
   - disable the psychoaccoustic modeller as it is too screwy right now, and I don't wish to fix it at this point
diff -r ade29d1d53fa -r a9aba74678fc audacious/ui_fileinfo.c
--- a/audacious/ui_fileinfo.c	Sun Jun 18 23:06:45 2006 -0700
+++ b/audacious/ui_fileinfo.c	Sun Jun 18 23:19:46 2006 -0700
@@ -70,9 +70,6 @@
 void *p;  /* not as useful now that check on popup window is done */
 gchar *cur_dir;  /* only one album image per directory, no need to look again */
 
-/* XXX: possible cover names, we need a better solution than this */
-static gchar *artwork_fn[] = { "cover.jpg", "Cover.jpg", "cover.JPG", "Cover.JPG", NULL };
-
 static void
 fileinfo_entry_set_text(const char *entry, const char *text)
 {
@@ -305,7 +302,7 @@
 fileinfo_show_for_tuple(TitleInput *tuple)
 {
 	gchar *tmp;
-	gint i;
+	GDir *d;
 
 	if (tuple == NULL)
 		return;
@@ -325,14 +322,29 @@
 	if (tuple->track_number != 0)
 		fileinfo_entry_set_text_free("entry_track", g_strdup_printf("%d", tuple->track_number));
 
-	for (i = 0; artwork_fn[i] != NULL; i++)
-	{
-		tmp = g_strdup_printf("%s/%s", tuple->file_path, artwork_fn[i]);
-
-		if (g_file_test(tmp, G_FILE_TEST_EXISTS))
-			fileinfo_entry_set_image("image_artwork", tmp);
-
-		g_free(tmp);
+	if (!cur_dir || strcmp(cur_dir,tuple->file_path) != 0)
+	{	
+		cur_dir = tuple->file_path;
+		d = g_dir_open(cur_dir,0,NULL);
+		if (d)
+		{	
+			const gchar *f = g_dir_read_name(d);
+			while(f)
+			{
+				/* ok. why did I not have strcasestr, thought glib had that one */
+				if (strstr(f,".jpg") || strstr(f,".jpeg") || strstr(f,".png") || strstr(f,".JPG") || strstr(f,".JPEG") || strstr(f,".PNG"))
+				{
+					tmp = g_strdup_printf("%s/%s", cur_dir, f);
+					fileinfo_entry_set_image("image_artwork", tmp);
+					f = NULL;
+				}
+				else
+				{
+					f = g_dir_read_name(d);
+				}
+			}
+			g_dir_close(d);
+		}
 	}
 
 	gtk_widget_show(fileinfo_win);