* tests/test-photos.c: added possibility to dump all photos into a

  directory:
  tests/test-photos dump <mountpoint> <output_dir>

* src/itdb_artwork.c: changed byte order for full screen iPod
  Nanos.


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1297 f01d2545-417e-4e96-918e-98f8d0dbbcb6

3 files changed, 109 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ef59cb..5b146fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-03  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* tests/test-photos.c: added possibility to dump all photos into a
+	  directory:
+	  tests/test-photos dump <mountpoint> <output_dir>
+
+	* src/itdb_artwork.c: changed byte order for full screen iPod
+	  Nanos. 
+
 2006-06-01  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* src/db-artwork-writer.c (write_mhni): fix segfault caused by
diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c
index 7645e35..8a5b119 100644
--- a/src/itdb_artwork.c
+++ b/src/itdb_artwork.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-26 20:49:27 jcs>
+/* Time-stamp: <2006-06-03 01:57:04 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -379,20 +379,31 @@ itdb_thumb_get_rgb_data (Itdb_Device *device, Itdb_Thumb *thumb)
 {
 	void *pixels565;
 	guchar *pixels;
+	guint byte_order;
+	const Itdb_ArtworkFormat *img_info;
 
 	g_return_val_if_fail (device, NULL);
 	g_return_val_if_fail (thumb, NULL);
-
-	/* no rgb pixel data available (FIXME: calculate from real
-	 * image file) */
-	if (thumb->size == 0)  return NULL;
-
+	g_return_val_if_fail (thumb->size != 0, NULL);
+	img_info = itdb_get_artwork_info_from_type (device, thumb->type);
+	g_return_val_if_fail (img_info, NULL);
+	
 	pixels565 = get_pixel_data (device, thumb);
 	if (pixels565 == NULL) {
 		return NULL;
 	}
-	
-	pixels = unpack_RGB_565 (pixels565, thumb->size, device->byte_order);
+
+	byte_order = device->byte_order; 
+	/* Swap the byte order on full screen nano photos */
+	if (img_info->correlation_id == 1023)
+	{
+	    if (byte_order == G_LITTLE_ENDIAN)
+		byte_order = G_BIG_ENDIAN;
+	    else
+		byte_order = G_LITTLE_ENDIAN; 
+	}
+
+	pixels = unpack_RGB_565 (pixels565, thumb->size, byte_order);
 	g_free (pixels565);
 
 	return pixels;
diff --git a/tests/test-photos.c b/tests/test-photos.c
index ae03c21..16552bd 100644
--- a/tests/test-photos.c
+++ b/tests/test-photos.c
@@ -25,11 +25,15 @@
 #include "itdb.h"
 
 #include <locale.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n-lib.h>
 
 static void
-save_itdb_thumb (Itdb_PhotoDB *itdb, Itdb_Thumb *thumb, const char *filename)
+save_itdb_thumb (Itdb_PhotoDB *itdb, Itdb_Thumb *thumb,
+		 const gchar *filename)
 {
 	GdkPixbuf *pixbuf;
 	
@@ -42,44 +46,49 @@ save_itdb_thumb (Itdb_PhotoDB *itdb, Itdb_Thumb *thumb, const char *filename)
 }
 
 static void
-dump_thumbs (Itdb_PhotoDB *db, Itdb_Artwork *artwork, char *album_name )
+dump_thumbs (Itdb_PhotoDB *db, Itdb_Artwork *artwork,
+	     const gchar *album_name, const gchar *dir)
 {
 	GList *it;
 	gint i = 0;
+puts (album_name);
 
 	for (it = artwork->thumbnails; it != NULL; it = it->next, i++) {
 		Itdb_Thumb *thumb;
-		gchar *filename;
+		gchar *filename, *path;
 
 		thumb = (Itdb_Thumb *)it->data;
 		g_return_if_fail (thumb);
 
-        filename = g_strdup_printf ("%s-%d-%d.png",
-					album_name, artwork->id, i );
-		save_itdb_thumb (db, thumb, filename);
+		filename = g_strdup_printf ("%s-%d-%d.png",
+					    album_name, artwork->id, i );
+		path = g_build_filename (dir, filename, NULL);
 		g_free (filename);
+		save_itdb_thumb (db, thumb, path);
+		g_free (path);
 	}
 }
 
 static void
-dump_artwork (Itdb_PhotoDB *db, gint photo_id, char *album_name)
+dump_artwork (Itdb_PhotoDB *db, gint photo_id,
+	      const gchar *album_name, const gchar *dir)
 {
 	GList *it;
-	
+
 	for (it = db->photos; it != NULL; it = it->next) {
 		Itdb_Artwork *artwork;
 
 		artwork = (Itdb_Artwork *)it->data;
 		g_return_if_fail (artwork);
 		if( artwork->id == photo_id ) {
-			dump_thumbs( db, artwork, album_name );
+			dump_thumbs (db, artwork, album_name, dir);
 			break;
 		}
 	}
 }
 
 static void
-dump_albums (Itdb_PhotoDB *db)
+dump_albums (Itdb_PhotoDB *db, const gchar *dir)
 {
 	GList *it;
 	
@@ -91,11 +100,8 @@ dump_albums (Itdb_PhotoDB *db)
 		g_return_if_fail (album);
 
 		for (it2 = album->members; it2 != NULL; it2 = it2->next) {
-			gint *photo_id;
-
-			photo_id = it2->data;
-			g_return_if_fail (photo_id);
-			dump_artwork (db, *photo_id, album->name);
+		        gint photo_id = GPOINTER_TO_INT(it2->data);
+			dump_artwork (db, photo_id, album->name, dir);
 		}
 	}
 }
@@ -108,37 +114,78 @@ main (int argc, char **argv)
     gint i; 
 
     if (argc < 4) {
-        g_print ("Usage: %s mountpoint albumname filename(s)\n", argv[0]);
-        g_print ("albumname should be set to 'master' to add photos to the master photo album\n");
+	g_print (_("Usage to add photos:\n"));
+        g_print (_("%s <mountpoint> <albumname> <filename(s)>\n"), argv[0]);
+        g_print (_("albumname should be set to 'master' to add photos to the master photo album\n"));
+	g_print (_("\n"));
+	g_print (_("Usage to dump all photos to <output_dir>:\n"));
+	g_print (_("%s dump <mountpoint> <output_dir>\n"), argv[0]);
         return 1;
     }
     setlocale (LC_ALL, "");
     g_type_init ();
-    db = itdb_photodb_parse (argv[1], &error);
 
-    if (db == NULL) {
-	if (error)
+    if (strcmp (argv[1], "dump") == 0)
+    {
+	if (!g_file_test (argv[3], G_FILE_TEST_EXISTS))
 	{
-	    g_print (_("Error reading iPod photo database (%s).\nWill attempt to create a new database.\n"), error->message);
-	    g_error_free (error);
-	    error = NULL;
+	    if (mkdir (argv[3], 0777) == -1)
+	    {
+		g_print (_("Error creating '%s' (mkdir)\n"), argv[3]);
+		return 1;
+	    }
 	}
-	else
+	if (!g_file_test (argv[3], G_FILE_TEST_IS_DIR))
 	{
-	    g_print (_("Error reading iPod photo database, will attempt to create a new database\n"));
+	    g_print (_("Error: '%s' is not a directory\n"), argv[3]);
+	    return 1;
 	}
-	db = itdb_photodb_new ();
-	itdb_device_set_mountpoint (db->device, argv[1]);
-    }
 
-    if( 0 )
-        dump_albums (db);
+	db = itdb_photodb_parse (argv[2], &error);
+	if (db == NULL)
+	{
+	    if (error)
+	    {
+		g_print (_("Error reading iPod photo database (%s).\n"), error->message);
+		g_error_free (error);
+		error = NULL;
+	    }
+	    else
+	    {
+		g_print (_("Error reading iPod photo database.\n"));
+	    }
+	    return 1;
+	}
+        dump_albums (db, argv[3]);
+	itdb_photodb_free (db);
+    }
+    else
+    {
+	db = itdb_photodb_parse (argv[1], &error);
+	if (db == NULL)
+	{
+	    if (error)
+	    {
+		g_print (_("Error reading iPod photo database (%s).\nWill attempt to create a new database.\n"), error->message);
+		g_error_free (error);
+		error = NULL;
+	    }
+	    else
+	    {
+		g_print (_("Error reading iPod photo database, will attempt to create a new database\n"));
+	    }
+	    db = itdb_photodb_new ();
+	    itdb_device_set_mountpoint (db->device, argv[1]);
+	}
+	for (i=3; i<argc; ++i)
+	{
+	    itdb_photodb_add_photo (db, argv[2], argv[i]);
+	}
 
-    for (i=3; i<argc; ++i) {
-        itdb_photodb_add_photo (db, argv[2], argv[i]);
+	itdb_photodb_write (db, NULL);
+	itdb_photodb_free (db);
     }
-    itdb_photodb_write (db, NULL);
-    itdb_photodb_free (db);
+
     return 0;
 }