/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis, Laurent Monin
*
static gboolean metadata_file_read(gchar *path, GList **keywords, gchar **comment);
+/*
+ *-------------------------------------------------------------------
+ * long-term cache - keep keywords from whole dir in memory
+ *-------------------------------------------------------------------
+ */
+
+/* fd->cached metadata list of lists
+ each particular list contains key as a first entry, then the values
+*/
+
+static void metadata_cache_update(FileData *fd, const gchar *key, const GList *values)
+{
+ GList *work;
+
+ work = fd->cached_metadata;
+ while (work)
+ {
+ GList *entry = work->data;
+ gchar *entry_key = entry->data;
+
+ if (strcmp(entry_key, key) == 0)
+ {
+ /* key found - just replace values */
+ GList *old_values = entry->next;
+ entry->next = NULL;
+ old_values->prev = NULL;
+ string_list_free(old_values);
+ work->data = g_list_append(entry, string_list_copy(values));
+ DEBUG_1("updated %s %s\n", key, fd->path);
+ return;
+ }
+ work = work->next;
+ }
+
+ /* key not found - prepend new entry */
+ fd->cached_metadata = g_list_prepend(fd->cached_metadata,
+ g_list_prepend(string_list_copy(values), g_strdup(key)));
+ DEBUG_1("added %s %s\n", key, fd->path);
+
+}
+
+static const GList *metadata_cache_get(FileData *fd, const gchar *key)
+{
+ GList *work;
+
+ work = fd->cached_metadata;
+ while (work)
+ {
+ GList *entry = work->data;
+ gchar *entry_key = entry->data;
+
+ if (strcmp(entry_key, key) == 0)
+ {
+ /* key found */
+ DEBUG_1("found %s %s\n", key, fd->path);
+ return entry;
+ }
+ work = work->next;
+ }
+ return NULL;
+ DEBUG_1("not found %s %s\n", key, fd->path);
+}
+
+static void metadata_cache_remove(FileData *fd, const gchar *key)
+{
+ GList *work;
+
+ work = fd->cached_metadata;
+ while (work)
+ {
+ GList *entry = work->data;
+ gchar *entry_key = entry->data;
+
+ if (strcmp(entry_key, key) == 0)
+ {
+ /* key found */
+ string_list_free(entry);
+ fd->cached_metadata = g_list_delete_link(fd->cached_metadata, work);
+ DEBUG_1("removed %s %s\n", key, fd->path);
+ return;
+ }
+ work = work->next;
+ }
+ DEBUG_1("not removed %s %s\n", key, fd->path);
+}
+
+void metadata_cache_free(FileData *fd)
+{
+ GList *work;
+ if (fd->cached_metadata) DEBUG_1("freed %s\n", fd->path);
+
+ work = fd->cached_metadata;
+ while (work)
+ {
+ GList *entry = work->data;
+ string_list_free(entry);
+
+ work = work->next;
+ }
+ g_list_free(fd->cached_metadata);
+ fd->cached_metadata = NULL;
+}
+
+
+
+
+
/*
*-------------------------------------------------------------------
return ret;
}
+void metadata_notify_cb(FileData *fd, NotifyType type, gpointer data)
+{
+ if (type & (NOTIFY_REREAD | NOTIFY_CHANGE))
+ {
+ metadata_cache_free(fd);
+
+ if (g_list_find(metadata_write_queue, fd))
+ {
+ DEBUG_1("Notify metadata: %s %04x", fd->path, type);
+ if (!isname(fd->path))
+ {
+ /* ignore deleted files */
+ metadata_write_queue_remove(fd);
+ }
+ }
+ }
+}
gboolean metadata_write_queue_confirm(gboolean force_dialog, FileUtilDoneFunc done_func, gpointer done_data)
{
FileData *fd = work->data;
work = work->next;
+ if (!isname(fd->path))
+ {
+ /* ignore deleted files */
+ metadata_write_queue_remove(fd);
+ continue;
+ }
+
if (fd->change) continue; /* another operation in progress, skip this file for now */
to_approve = g_list_prepend(to_approve, file_data_ref(fd));
store the metadata in the cache)
FIXME: this does not catch new sidecars created by independent external programs
*/
- file_data_unref(file_data_new_simple(fd->change->dest));
+ file_data_unref(file_data_new_group(fd->change->dest));
if (success) metadata_legacy_delete(fd, fd->change->dest);
return success;
fd->modified_xmp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)string_list_free);
}
g_hash_table_insert(fd->modified_xmp, g_strdup(key), string_list_copy((GList *)values));
+
+ metadata_cache_remove(fd, key);
+
if (fd->exif)
{
exif_update_metadata(fd->exif, key, values);
{
gchar string[50];
- g_snprintf(string, sizeof(string), "%ld", value);
+ g_snprintf(string, sizeof(string), "%llu", (unsigned long long) value);
return metadata_write_string(fd, key, string);
}
have_keywords = g_hash_table_lookup_extended(fd->modified_xmp, KEYWORD_KEY, NULL, &keywords);
have_comment = g_hash_table_lookup_extended(fd->modified_xmp, COMMENT_KEY, NULL, &comment_l);
- comment = comment_l ? ((GList *)comment_l)->data : NULL;
+ comment = (have_comment && comment_l) ? ((GList *)comment_l)->data : NULL;
if (!have_keywords || !have_comment) metadata_file_read(metadata_pathl, &orig_keywords, &orig_comment);
{
ExifData *exif;
GList *list = NULL;
+ const GList *cache_entry;
if (!fd) return NULL;
/* unwritten data overide everything */
if (list) return string_list_copy(list);
}
+
+ if (format == METADATA_PLAIN && strcmp(key, KEYWORD_KEY) == 0
+ && (cache_entry = metadata_cache_get(fd, key)))
+ {
+ return string_list_copy(cache_entry->next);
+ }
+
/*
Legacy metadata file is the primary source if it exists.
Merging the lists does not make much sense, because the existence of
*/
if (strcmp(key, KEYWORD_KEY) == 0)
{
- if (metadata_legacy_read(fd, &list, NULL)) return list;
- }
+ if (metadata_legacy_read(fd, &list, NULL))
+ {
+ if (format == METADATA_PLAIN)
+ {
+ metadata_cache_update(fd, key, list);
+ }
+ return list;
+ }
+ }
else if (strcmp(key, COMMENT_KEY) == 0)
{
gchar *comment = NULL;
if (!exif) return NULL;
list = exif_get_metadata(exif, key, format);
exif_free_fd(fd, exif);
+
+ if (format == METADATA_PLAIN && strcmp(key, KEYWORD_KEY) == 0)
+ {
+ metadata_cache_update(fd, key, list);
+ }
+
return list;
}
}
}
+/**
+ * \see find_string_in_list
+ */
gchar *find_string_in_list_utf8nocase(GList *list, const gchar *string)
{
gchar *string_casefold = g_utf8_casefold(string, -1);
while (list)
{
gchar *haystack = list->data;
-
+
if (haystack)
{
gboolean equal;
return haystack;
}
}
-
+
list = list->next;
}
-
+
g_free(string_casefold);
return NULL;
}
+/**
+ * \see find_string_in_list
+ */
+gchar *find_string_in_list_utf8case(GList *list, const gchar *string)
+{
+ while (list)
+ {
+ gchar *haystack = list->data;
+
+ if (haystack && strcmp(haystack, string) == 0)
+ return haystack;
+
+ list = list->next;
+ } // while (list)
+
+ return NULL;
+} // gchar *find_string_in_list_utf...
+
+/**
+ * \brief Find a existent string in a list.
+ *
+ * This is a switch between find_string_in_list_utf8case and
+ * find_string_in_list_utf8nocase to search with or without case for the
+ * existence of a string.
+ *
+ * \param list The list to search in
+ * \param string The string to search for
+ * \return The string or NULL
+ *
+ * \see find_string_in_list_utf8case
+ * \see find_string_in_list_utf8nocase
+ */
+gchar *find_string_in_list(GList *list, const gchar *string)
+{
+ if (options->metadata.keywords_case_sensitive)
+ return find_string_in_list_utf8case(list, string);
+ else
+ return find_string_in_list_utf8nocase(list, string);
+}
#define KEYWORDS_SEPARATOR(c) ((c) == ',' || (c) == ';' || (c) == '\n' || (c) == '\r' || (c) == '\b')
gchar *keyword = g_strndup(begin, l);
/* only add if not already in the list */
- if (!find_string_in_list_utf8nocase(list, keyword))
+ if (!find_string_in_list(list, keyword))
list = g_list_append(list, keyword);
else
g_free(keyword);
if (keyword_get_is_keyword(keyword_tree, &iter))
{
gchar *name = keyword_get_name(keyword_tree, &iter);
- if (!find_string_in_list_utf8nocase(*kw_list, name))
+ if (!find_string_in_list(*kw_list, name))
{
*kw_list = g_list_append(*kw_list, name);
}
}
}
+GList *keyword_tree_get(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr)
+{
+ GtkTreeIter iter = *iter_ptr;
+ GList *kw_list = NULL;
+
+ while (TRUE)
+ {
+ GtkTreeIter parent;
+
+ if (keyword_get_is_keyword(keyword_tree, &iter))
+ {
+ gchar *name = keyword_get_name(keyword_tree, &iter);
+ kw_list = g_list_append(kw_list, name);
+ }
+
+ if (!gtk_tree_model_iter_parent(keyword_tree, &parent, &iter)) return kw_list;
+ iter = parent;
+ }
+} // GList *keyword_tree_get(GtkTre...
+
static void keyword_tree_reset1(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GList **kw_list)
{
gchar *found;
if (!keyword_get_is_keyword(keyword_tree, iter)) return;
name = keyword_get_name(keyword_tree, iter);
- found = find_string_in_list_utf8nocase(*kw_list, name);
+ found = find_string_in_list(*kw_list, name);
if (found)
{
void keyword_tree_new_default(void)
{
- GtkTreeIter i1, i2, i3;
+ GtkTreeIter i1, i2;
if (!keyword_tree) keyword_tree_new();
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Family"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Free time"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Children"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sport"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Culture"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Festival"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Nature"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Animal"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Bird"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Insect"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Pets"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Wildlife"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Zoo"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Plant"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Tree"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Flower"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Water"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("River"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Lake"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Sea"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Landscape"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Art"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Statue"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Painting"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("City"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Park"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Street"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Square"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Architecture"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Buildings"), FALSE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("House"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Cathedral"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Palace"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Castle"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Bridge"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Interior"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Places"), FALSE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Conditions"), FALSE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Night"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Lights"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Reflections"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sun"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Weather"), FALSE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Fog"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Rain"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Clouds"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Snow"), TRUE);
- i3 = keyword_tree_default_append(keyword_tree, &i2, _("Sunny weather"), TRUE);
- i1 = keyword_tree_default_append(keyword_tree, NULL, _("Photo"), FALSE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Edited"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Detail"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Macro"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Portrait"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Black and White"), TRUE);
- i2 = keyword_tree_default_append(keyword_tree, &i1, _("Perspective"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Family"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Free time"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Children"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sport"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Culture"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Festival"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Nature"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Animal"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Bird"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Insect"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Pets"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Wildlife"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Zoo"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Plant"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Tree"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Flower"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Water"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("River"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Lake"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Sea"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Landscape"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Art"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Statue"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Painting"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("City"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Park"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Street"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Square"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Architecture"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Buildings"), FALSE);
+ keyword_tree_default_append(keyword_tree, &i2, _("House"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Cathedral"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Palace"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Castle"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Bridge"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Interior"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Places"), FALSE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Conditions"), FALSE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Night"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Lights"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Reflections"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sun"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Weather"), FALSE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Fog"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Rain"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Clouds"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Snow"), TRUE);
+ keyword_tree_default_append(keyword_tree, &i2, _("Sunny weather"), TRUE);
+ i1 = keyword_tree_default_append(keyword_tree, NULL, _("Photo"), FALSE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Edited"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Detail"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Macro"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Portrait"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Black and White"), TRUE);
+ i2 = keyword_tree_default_append(keyword_tree, &i1, _("Perspective"), TRUE);
}
projects / geeqie.git / blobdiff