[gthumb] Convert the old catalogs to the new format and location
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] Convert the old catalogs to the new format and location
- Date: Wed, 21 Jul 2010 18:34:46 +0000 (UTC)
commit adae68e2b2cc792835832a9f968952dbc9bbae4e
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Jul 21 19:50:42 2010 +0200
Convert the old catalogs to the new format and location
[bug #618302]
data/gthumb.schemas.in | 14 ++
gthumb/gth-preferences.h | 3 +
gthumb/main-migrate-catalogs.c | 483 ++++++++++++++++++++++++++++++++++++++++
gthumb/main-migrate.h | 30 +++
gthumb/main.c | 22 ++-
5 files changed, 546 insertions(+), 6 deletions(-)
---
diff --git a/data/gthumb.schemas.in b/data/gthumb.schemas.in
index 70c0bb8..083a248 100644
--- a/data/gthumb.schemas.in
+++ b/data/gthumb.schemas.in
@@ -69,6 +69,20 @@
</locale>
</schema>
+ <!-- Data Migration -->
+
+ <schema>
+ <key>/schemas/apps/gthumb/data_migration/catalogs_2_10</key>
+ <applyto>/apps/gthumb/data_migration/catalogs_2_10</applyto>
+ <owner>gthumb</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
<!-- Browser -->
<schema>
diff --git a/gthumb/gth-preferences.h b/gthumb/gth-preferences.h
index 59bfaf0..aecf833 100644
--- a/gthumb/gth-preferences.h
+++ b/gthumb/gth-preferences.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
#define PREF_STARTUP_LOCATION "/apps/gthumb/general/startup_location"
#define PREF_ACTIVE_EXTENSIONS "/apps/gthumb/general/active_extensions"
#define PREF_STORE_METADATA_IN_FILES "/apps/gthumb/general/store_metadata_in_files"
+
+#define PREF_DATA_MIGRATION_CATALOGS_2_10 "/apps/gthumb/data_migration/catalogs_2_10"
+
#define PREF_GENERAL_FILTER "/apps/gthumb/browser/general_filter"
#define PREF_SHOW_HIDDEN_FILES "/apps/gthumb/browser/show_hidden_files"
#define PREF_SHOW_THUMBNAILS "/apps/gthumb/browser/show_thumbnails"
diff --git a/gthumb/main-migrate-catalogs.c b/gthumb/main-migrate-catalogs.c
new file mode 100644
index 0000000..5fa25b0
--- /dev/null
+++ b/gthumb/main-migrate-catalogs.c
@@ -0,0 +1,483 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * GThumb
+ *
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <string.h>
+#include "dom.h"
+#include "gconf-utils.h"
+#include "gio-utils.h"
+#include "glib-utils.h"
+#include "gth-time.h"
+#include "gth-preferences.h"
+#include "gth-user-dir.h"
+
+
+#define MAX_LINE_LENGTH 4096
+
+
+static void
+migration_done (GError *error,
+ gpointer user_data)
+{
+ GFile *collections_dir = user_data;
+
+ eel_gconf_set_boolean (PREF_DATA_MIGRATION_CATALOGS_2_10, TRUE);
+ g_object_unref (collections_dir);
+}
+
+
+static void
+copy_unquoted (char *unquoted,
+ char *line)
+{
+ int len = strlen (line);
+
+ strncpy (unquoted, line + 1, len - 2);
+ unquoted[len - 2] = 0;
+}
+
+
+static void
+migration_for_each_file (GFile *file,
+ GFileInfo *info,
+ gpointer user_data)
+{
+ GFile *collections_dir = user_data;
+ char *buffer;
+ gsize buffer_size;
+ GError *error = NULL;
+ DomDocument *document;
+ char *extension;
+ char *new_buffer;
+ gsize new_buffer_size;
+ char *catalogs_path;
+ char *relative_path;
+ char *tmp_path;
+ char *full_path_no_ext;
+ char *full_path;
+ GFile *catalog_file;
+ GFile *catalog_dir;
+ char *catalog_dir_path;
+
+ if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
+ return;
+
+ if (! g_load_file_in_buffer (file,
+ (void **) &buffer,
+ &buffer_size,
+ &error))
+ {
+ g_warning ("%s", error->message);
+ return;
+ }
+
+ if (buffer != NULL)
+ buffer[buffer_size] = '\0';
+
+ /*
+ g_print ("* %s\n", g_file_get_path (file));
+ g_print ("%s\n", buffer);
+ */
+
+ document = dom_document_new ();
+ extension = ".catalog";
+
+ if ((buffer != NULL) && (*buffer != '\0')) {
+ /*
+ * Catalog Format : A list of quoted filenames, one name per line :
+ * # sort: name Optional: possible values: none, name, path, size, time, manual
+ * "filename_1"
+ * "filename_2"
+ * ...
+ * "filename_n"
+ *
+ * Search Format : Search data followed by files list :
+ * # Search Line 1 : search data starts with SEARCH_HEADER
+ * "/home/pippo" Line 2 : directory to start from.
+ * "FALSE" Line 3 : recursive.
+ * "*.jpg" Line 4 : file pattern.
+ * "" Line 5 : comment pattern.
+ * "Rome; Paris" Line 6 : place pattern.
+ * 0"Formula 1" Line 7 : old versions have only a keywords
+ * pattern, new versions have a 0 or 1
+ * (0 = must match at leaset one
+ * keyword; 1 = must match all keywords)
+ * followed by the keywords pattern.
+ * 1022277600 Line 8 : date in time_t format.
+ * 0 Line 9 : date scope (DATE_ANY = 0,
+ * DATE_BEFORE = 1,
+ * DATE_EQUAL_TO = 2,
+ * DATE_AFTER = 3)
+ * "filename_1" From Line 10 as catalog format.
+ * "filename_2"
+ * ...
+ * "filename_n"
+ *
+ */
+
+ gboolean file_list = FALSE;
+ char **lines;
+ int n_line;
+ DomElement *root_node = NULL;
+ DomElement *files_node = NULL;
+ DomElement *folder_node = NULL;
+ DomElement *tests_node = NULL;
+
+ lines = g_strsplit (buffer, "\n", -1);
+ for (n_line = 0; lines[n_line] != NULL; n_line++) {
+ char *line = lines[n_line];
+ char *filename;
+ char unquoted [MAX_LINE_LENGTH];
+
+ if (! file_list && (strncmp (line, "# Search", 8) == 0)) {
+ DomElement *node;
+ char *s;
+ gboolean b;
+ int line_ofs;
+ gboolean all_keywords;
+ time_t date;
+ int date_scope;
+
+ extension = ".search";
+ root_node = dom_document_create_element (document, "search", "version", "1.0", NULL);
+ dom_element_append_child (DOM_ELEMENT (document), root_node);
+
+ /* -- folder -- */
+
+ /* line 2: start directory */
+
+ n_line++;
+ copy_unquoted (unquoted, lines[n_line]);
+ s = g_strdup (unquoted);
+
+ /* line 3: recursive */
+
+ n_line++;
+ copy_unquoted (unquoted, lines[n_line]);
+ b = strcmp (unquoted, "TRUE") == 0;
+
+ folder_node = dom_document_create_element (document, "folder",
+ "recursive", (b ? "true" : "false"),
+ "uri", s,
+ NULL);
+
+ g_free (s);
+
+ /* -- tests -- */
+
+ tests_node = dom_document_create_element (document, "tests",
+ "match", "all",
+ NULL);
+
+ /* line 4: filename */
+
+ n_line++;
+ copy_unquoted (unquoted, lines[n_line]);
+ s = g_strdup (unquoted);
+ if (strcmp (s, "") != 0) {
+ char *op;
+
+ if (strchr (s, '*') == NULL)
+ op = "contains";
+ else
+ op = "matches";
+ node = dom_document_create_element (document, "test",
+ "id", "file::name",
+ "op", op,
+ "value", s,
+ NULL);
+ dom_element_append_child (tests_node, node);
+ }
+
+ g_free (s);
+
+ /* line 5: comment */
+
+ n_line++;
+ copy_unquoted (unquoted, lines[n_line]);
+ s = g_strdup (unquoted);
+ if (strcmp (s, "") != 0) {
+ node = dom_document_create_element (document, "test",
+ "id", "comment::note",
+ "op", "contains",
+ "value", s,
+ NULL);
+ dom_element_append_child (tests_node, node);
+ }
+
+ g_free (s);
+
+ /* line 6: place */
+
+ n_line++;
+ copy_unquoted (unquoted, lines[n_line]);
+ s = g_strdup (unquoted);
+ if (strcmp (s, "") != 0) {
+ char **v;
+ int j;
+
+ v = g_strsplit (s, ";", -1);
+ for (j = 0; v[j] != NULL; j++) {
+ node = dom_document_create_element (document, "test",
+ "id", "comment::place",
+ "op", "contains",
+ "value", g_strstrip (v[j]),
+ NULL);
+ dom_element_append_child (tests_node, node);
+ }
+
+ g_strfreev (v);
+ }
+
+ g_free (s);
+
+ /* line 7: keywords */
+
+ n_line++;
+ line_ofs = 0;
+ all_keywords = FALSE;
+ if (lines[n_line][0] != '"') {
+ line_ofs = 1;
+ all_keywords = (*line == '1');
+ }
+ copy_unquoted (unquoted, lines[n_line] + line_ofs);
+ s = g_strdup (unquoted);
+ if (strcmp (s, "") != 0) {
+ char **v;
+ int j;
+
+ v = g_strsplit (s, ";", -1);
+ for (j = 0; v[j] != NULL; j++) {
+ node = dom_document_create_element (document, "test",
+ "id", "comment::category",
+ "op", "equal",
+ "value", g_strstrip (v[j]),
+ NULL);
+ dom_element_append_child (tests_node, node);
+ }
+
+ g_strfreev (v);
+ }
+
+ g_free (s);
+
+ /* line 8: date */
+
+ n_line++;
+ sscanf (lines[n_line], "%ld", &date);
+
+ /* line 9: date scope */
+
+ n_line++;
+ sscanf (line, "%d", &date_scope);
+
+ if ((date > 0) && (date_scope >= 1) && (date_scope <= 3)) {
+ struct tm *tm;
+ GthDateTime *dt;
+ char *exif_date;
+ char *op;
+
+ tm = localtime (&date);
+ dt = gth_datetime_new ();
+ gth_datetime_from_struct_tm (dt, tm);
+ exif_date = gth_datetime_to_exif_date (dt);
+
+ switch (date_scope) {
+ case 1:
+ op = "before";
+ break;
+ case 2:
+ op = "equal";
+ break;
+ case 3:
+ op = "after";
+ break;
+ default:
+ op = "";
+ break;
+ }
+
+ node = dom_document_create_element (document, "test",
+ "id", "file::mtime",
+ "op", op,
+ "value", exif_date,
+ NULL);
+ dom_element_append_child (tests_node, node);
+
+ g_free (exif_date);
+ gth_datetime_free (dt);
+ }
+
+ continue;
+ }
+
+ if (! file_list && (strncmp (line, "# sort: ", 8) == 0)) {
+ char *sort_name[] = { "none", "name", "path", "size", "time", "exif-date", "comment", "manual", NULL };
+ char *order_type[] = { "general::unsorted", "file::name", "file::name", "file::size", "file::mtime", "exif::photo::datetimeoriginal", "file::name", "general::unsorted" };
+ char *sort_type;
+ int i;
+
+ sort_type = line + 8;
+ sort_type[strlen (sort_type)] = 0;
+
+ for (i = 0; sort_name[i] != NULL; i++) {
+ if (strcmp (sort_type, sort_name[i]) == 0) {
+ DomElement *order_node;
+
+ if (root_node == NULL) {
+ root_node = dom_document_create_element (document, "catalog", "version", "1.0", NULL);
+ dom_element_append_child (DOM_ELEMENT (document), root_node);
+ }
+
+ order_node = dom_document_create_element (document, "order", "inverse", "0", "type", order_type[i], NULL);
+ dom_element_append_child (root_node, order_node);
+
+ break;
+ }
+ }
+
+ continue;
+ }
+
+ file_list = TRUE;
+ if (line[0] != '"')
+ continue;
+ if (strlen (line) <= 2)
+ continue;
+ filename = g_strndup (line + 1, strlen (line) - 2);
+
+ if (root_node == NULL) {
+ root_node = dom_document_create_element (document, "catalog", "version", "1.0", NULL);
+ dom_element_append_child (DOM_ELEMENT (document), root_node);
+ }
+
+ if (files_node == NULL) {
+ files_node = dom_document_create_element (document, "files", NULL);
+ dom_element_append_child (root_node, files_node);
+ }
+
+ dom_element_append_child (files_node, dom_document_create_element (document, "file", "uri", filename, NULL));
+
+ g_free (filename);
+ }
+
+ if (root_node == NULL) {
+ root_node = dom_document_create_element (document, "catalog", "version", "1.0", NULL);
+ dom_element_append_child (DOM_ELEMENT (document), root_node);
+ }
+
+ if (folder_node != NULL)
+ dom_element_append_child (root_node, folder_node);
+ if (tests_node != NULL)
+ dom_element_append_child (root_node, tests_node);
+
+
+ g_strfreev (lines);
+ }
+ else {
+ DomElement *root_node;
+ DomElement *files_node;
+
+ root_node = dom_document_create_element (document, "catalog", "version", "1.0", NULL);
+ dom_element_append_child (DOM_ELEMENT (document), root_node);
+
+ files_node = dom_document_create_element (document, "files", NULL);
+ dom_element_append_child (root_node, files_node);
+ }
+
+ new_buffer = dom_document_dump (document, &new_buffer_size);
+
+ catalogs_path = gth_user_dir_get_file (GTH_DIR_DATA, "gthumb", "catalogs", NULL);
+ relative_path = g_file_get_relative_path (collections_dir, file);
+ tmp_path = g_strconcat (catalogs_path, G_DIR_SEPARATOR_S, relative_path, NULL);
+ full_path_no_ext = _g_uri_remove_extension (tmp_path);
+ full_path = g_strconcat (full_path_no_ext, extension, NULL);
+ catalog_file = g_file_new_for_path (full_path);
+ catalog_dir = g_file_get_parent (catalog_file);
+ catalog_dir_path = g_file_get_path (catalog_dir);
+ g_mkdir_with_parents (catalog_dir_path, 0700);
+
+ /*
+ g_print ("==> %s\n", g_file_get_path (catalog_file));
+ g_print ("%s\n", new_buffer);
+ */
+
+ if (! g_file_query_exists (catalog_file, NULL)) {
+ if (! g_write_file (catalog_file,
+ FALSE,
+ G_FILE_CREATE_PRIVATE,
+ new_buffer,
+ new_buffer_size,
+ NULL,
+ &error))
+ {
+ g_warning ("%s", error->message);
+ }
+ }
+
+ g_object_unref (catalog_dir);
+ g_object_unref (catalog_file);
+ g_free (full_path);
+ g_free (full_path_no_ext);
+ g_free (tmp_path);
+ g_free (relative_path);
+ g_free (catalogs_path);
+ g_free (new_buffer);
+ g_object_unref (document);
+ g_free (buffer);
+}
+
+
+static DirOp
+migration_start_dir (GFile *directory,
+ GFileInfo *info,
+ GError **error,
+ gpointer user_data)
+{
+ return DIR_OP_CONTINUE;
+}
+
+
+void
+migrate_catalogs_from_2_10 (void)
+{
+ GFile *home_dir;
+ GFile *collections_dir;
+
+ if (eel_gconf_get_boolean (PREF_DATA_MIGRATION_CATALOGS_2_10, FALSE))
+ return;
+
+ home_dir = g_file_new_for_path (g_get_home_dir ());
+ collections_dir = _g_file_get_child (home_dir, ".gnome2", "gthumb", "collections", NULL);
+
+ g_directory_foreach_child (collections_dir,
+ TRUE,
+ TRUE,
+ "standard::name,standard::type",
+ NULL,
+ migration_start_dir,
+ migration_for_each_file,
+ migration_done,
+ collections_dir);
+
+ g_object_unref (home_dir);
+}
diff --git a/gthumb/main-migrate.h b/gthumb/main-migrate.h
new file mode 100644
index 0000000..efb8c9f
--- /dev/null
+++ b/gthumb/main-migrate.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * GThumb
+ *
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef MAIN_MIGRATE_H
+#define MAIN_MIGRATE_H
+
+
+void migrate_catalogs_from_2_10 (void);
+
+
+#endif /* MAIN_MIGRATE_H */
diff --git a/gthumb/main.c b/gthumb/main.c
index 7f25198..d3c9c9f 100644
--- a/gthumb/main.c
+++ b/gthumb/main.c
@@ -3,7 +3,7 @@
/*
* GThumb
*
- * Copyright (C) 2001-2009 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2010 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
#include "gth-file-source-vfs.h"
#include "gth-main.h"
#include "gth-preferences.h"
+#include "main-migrate.h"
enum {
@@ -90,6 +91,14 @@ static const GOptionEntry options[] = {
};
+
+static void
+migrate_data (void)
+{
+ migrate_catalogs_from_2_10 ();
+}
+
+
static void
gth_save_state (EggSMClient *client,
GKeyFile *state,
@@ -384,7 +393,7 @@ prepare_application (void)
int
main (int argc, char *argv[])
{
- GOptionContext *context = NULL;
+ GOptionContext *context;
GError *error = NULL;
if (! g_thread_supported ())
@@ -416,19 +425,20 @@ main (int argc, char *argv[])
return EXIT_FAILURE;
}
-#ifdef HAVE_CLUTTER
- ClutterInitResult = gtk_clutter_init (NULL, NULL);
-#endif
-
if (version) {
g_printf ("%s %s, Copyright (C) 2001-2010 Free Software Foundation, Inc.\n", PACKAGE_NAME, PACKAGE_VERSION);
return 0;
}
+#ifdef HAVE_CLUTTER
+ ClutterInitResult = gtk_clutter_init (NULL, NULL);
+#endif
+
/* other initializations */
gth_session_manager_init ();
gth_pref_initialize ();
+ migrate_data ();
gth_main_initialize ();
prepare_application ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
