Update of /cvsroot/gtkpod/libgpod/tests
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22852/tests
Modified Files:
test-photos.c
Log Message:
* 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.
Index: test-photos.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/tests/test-photos.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test-photos.c 30 May 2006 14:09:44 -0000 1.2
+++ test-photos.c 2 Jun 2006 17:01:47 -0000 1.3
@@ -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 @@
}
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 @@
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 @@
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;
}
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
