[nautilus] Bug 699718 - Add metadata capabilities to search
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Bug 699718 - Add metadata capabilities to search
- Date: Thu, 18 Jul 2013 15:20:36 +0000 (UTC)
commit 8a312968efa05ba3d8e1d2ed39a7e8db1b25b3bb
Author: Garrett Regier <garrett yorba org>
Date: Wed Jul 17 09:29:46 2013 -0700
Bug 699718 - Add metadata capabilities to search
libnautilus-private/Makefile.am | 2 +
libnautilus-private/nautilus-desktop-metadata.c | 238 ++--------------
libnautilus-private/nautilus-keyfile-metadata.c | 318 ++++++++++++++++++++
libnautilus-private/nautilus-keyfile-metadata.h | 48 +++
.../nautilus-search-directory-file.c | 60 ++++-
5 files changed, 446 insertions(+), 220 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index d1d0401..dc8e1d1 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -120,6 +120,8 @@ libnautilus_private_la_SOURCES = \
nautilus-icon-info.c \
nautilus-icon-info.h \
nautilus-icon-names.h \
+ nautilus-keyfile-metadata.c \
+ nautilus-keyfile-metadata.h \
nautilus-lib-self-check-functions.c \
nautilus-lib-self-check-functions.h \
nautilus-link.c \
diff --git a/libnautilus-private/nautilus-desktop-metadata.c b/libnautilus-private/nautilus-desktop-metadata.c
index a8856e2..bb19101 100644
--- a/libnautilus-private/nautilus-desktop-metadata.c
+++ b/libnautilus-private/nautilus-desktop-metadata.c
@@ -26,17 +26,8 @@
#include "nautilus-desktop-metadata.h"
-#include "nautilus-directory-notify.h"
-#include "nautilus-file-private.h"
#include "nautilus-file-utilities.h"
-
-#include <glib/gstdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static guint save_in_idle_source_id = 0;
+#include "nautilus-keyfile-metadata.h"
static gchar *
get_keyfile_path (void)
@@ -47,246 +38,55 @@ get_keyfile_path (void)
retval = g_build_filename (xdg_dir, "desktop-metadata", NULL);
g_free (xdg_dir);
-
- return retval;
-}
-
-static gboolean
-save_in_idle_cb (gpointer data)
-{
- GKeyFile *keyfile = data;
- gchar *contents, *filename;
- gsize length;
- GError *error = NULL;
-
- save_in_idle_source_id = 0;
-
- contents = g_key_file_to_data (keyfile, &length, NULL);
- filename = get_keyfile_path ();
-
- if (contents != NULL) {
- g_file_set_contents (filename,
- contents, length,
- &error);
- g_free (contents);
- }
-
- if (error != NULL) {
- g_warning ("Couldn't save the desktop metadata keyfile to disk: %s",
- error->message);
- g_error_free (error);
- }
-
- g_free (filename);
-
- return FALSE;
-}
-
-static void
-save_in_idle (GKeyFile *keyfile)
-{
- if (save_in_idle_source_id != 0) {
- g_source_remove (save_in_idle_source_id);
- }
-
- save_in_idle_source_id = g_idle_add (save_in_idle_cb, keyfile);
-}
-
-static GKeyFile *
-load_metadata_keyfile (void)
-{
- GKeyFile *retval;
- GError *error = NULL;
- gchar *filename;
-
- retval = g_key_file_new ();
- filename = get_keyfile_path ();
-
- g_key_file_load_from_file (retval,
- filename,
- G_KEY_FILE_NONE,
- &error);
-
- if (error != NULL) {
- if (!g_error_matches (error,
- G_FILE_ERROR,
- G_FILE_ERROR_NOENT)) {
- g_print ("Unable to open the desktop metadata keyfile: %s\n",
- error->message);
- }
-
- g_error_free (error);
- }
-
- g_free (filename);
return retval;
}
-static GKeyFile *
-get_keyfile (void)
-{
- static gboolean keyfile_loaded = FALSE;
- static GKeyFile *keyfile = NULL;
-
- if (!keyfile_loaded) {
- keyfile = load_metadata_keyfile ();
- keyfile_loaded = TRUE;
- }
-
- return keyfile;
-}
-
void
nautilus_desktop_set_metadata_string (NautilusFile *file,
const gchar *name,
const gchar *key,
const gchar *string)
{
- GKeyFile *keyfile;
+ gchar *keyfile_filename;
- keyfile = get_keyfile ();
+ keyfile_filename = get_keyfile_path ();
- g_key_file_set_string (keyfile,
- name,
- key,
- string);
+ nautilus_keyfile_metadata_set_string (file, keyfile_filename,
+ name, key, string);
- save_in_idle (keyfile);
-
- if (nautilus_desktop_update_metadata_from_keyfile (file, name)) {
- nautilus_file_changed (file);
- }
+ g_free (keyfile_filename);
}
-#define STRV_TERMINATOR "@x-nautilus-desktop-metadata-term@"
-
void
nautilus_desktop_set_metadata_stringv (NautilusFile *file,
const char *name,
const char *key,
const char * const *stringv)
{
- GKeyFile *keyfile;
- guint length;
- gchar **actual_stringv = NULL;
- gboolean free_strv = FALSE;
-
- keyfile = get_keyfile ();
-
- /* if we would be setting a single-length strv, append a fake
- * terminator to the array, to be able to differentiate it later from
- * the single string case
- */
- length = g_strv_length ((gchar **) stringv);
-
- if (length == 1) {
- actual_stringv = g_malloc0 (3 * sizeof (gchar *));
- actual_stringv[0] = (gchar *) stringv[0];
- actual_stringv[1] = STRV_TERMINATOR;
- actual_stringv[2] = NULL;
-
- length = 2;
- free_strv = TRUE;
- } else {
- actual_stringv = (gchar **) stringv;
- }
+ gchar *keyfile_filename;
- g_key_file_set_string_list (keyfile,
- name,
- key,
- (const gchar **) actual_stringv,
- length);
+ keyfile_filename = get_keyfile_path ();
- save_in_idle (keyfile);
+ nautilus_keyfile_metadata_set_stringv (file, keyfile_filename,
+ name, key, stringv);
- if (nautilus_desktop_update_metadata_from_keyfile (file, name)) {
- nautilus_file_changed (file);
- }
-
- if (free_strv) {
- g_free (actual_stringv);
- }
+ g_free (keyfile_filename);
}
gboolean
nautilus_desktop_update_metadata_from_keyfile (NautilusFile *file,
const gchar *name)
{
- gchar **keys, **values;
- const gchar *actual_values[2];
- const gchar *key, *value;
- gchar *gio_key;
- gsize length, values_length;
- GKeyFile *keyfile;
- GFileInfo *info;
- gint idx;
- gboolean res;
-
- keyfile = get_keyfile ();
-
- keys = g_key_file_get_keys (keyfile,
- name,
- &length,
- NULL);
-
- if (keys == NULL) {
- return FALSE;
- }
-
- info = g_file_info_new ();
-
- for (idx = 0; idx < length; idx++) {
- key = keys[idx];
- values = g_key_file_get_string_list (keyfile,
- name,
- key,
- &values_length,
- NULL);
-
- gio_key = g_strconcat ("metadata::", key, NULL);
-
- if (values_length < 1) {
- continue;
- } else if (values_length == 1) {
- g_file_info_set_attribute_string (info,
- gio_key,
- values[0]);
- } else if (values_length == 2) {
- /* deal with the fact that single-length strv are stored
- * with an additional terminator in the keyfile string, to differentiate
- * them from the regular string case.
- */
- value = values[1];
-
- if (g_strcmp0 (value, STRV_TERMINATOR) == 0) {
- /* if the 2nd value is the terminator, remove it */
- actual_values[0] = values[0];
- actual_values[1] = NULL;
-
- g_file_info_set_attribute_stringv (info,
- gio_key,
- (gchar **) actual_values);
- } else {
- /* otherwise, set it as a regular strv */
- g_file_info_set_attribute_stringv (info,
- gio_key,
- values);
- }
- } else {
- g_file_info_set_attribute_stringv (info,
- gio_key,
- values);
- }
-
- g_free (gio_key);
- g_strfreev (values);
- }
+ gchar *keyfile_filename;
+ gboolean result;
- res = nautilus_file_update_metadata_from_info (file, info);
+ keyfile_filename = get_keyfile_path ();
- g_strfreev (keys);
- g_object_unref (info);
+ result = nautilus_keyfile_metadata_update_from_keyfile (file,
+ keyfile_filename,
+ name);
- return res;
+ g_free (keyfile_filename);
+ return result;
}
diff --git a/libnautilus-private/nautilus-keyfile-metadata.c b/libnautilus-private/nautilus-keyfile-metadata.c
new file mode 100644
index 0000000..a1cee24
--- /dev/null
+++ b/libnautilus-private/nautilus-keyfile-metadata.c
@@ -0,0 +1,318 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Nautilus
+ *
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <cosimoc redhat com>
+ */
+
+#include <config.h>
+
+#include "nautilus-keyfile-metadata.h"
+
+#include "nautilus-directory-notify.h"
+#include "nautilus-file-private.h"
+#include "nautilus-file-utilities.h"
+
+#include <glib/gstdio.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+typedef struct {
+ GKeyFile *keyfile;
+ guint save_in_idle_id;
+} KeyfileMetadataData;
+
+static GHashTable *data_hash = NULL;
+
+static KeyfileMetadataData *
+keyfile_metadata_data_new (const char *keyfile_filename)
+{
+ KeyfileMetadataData *data;
+ GKeyFile *retval;
+ GError *error = NULL;
+
+ retval = g_key_file_new ();
+
+ g_key_file_load_from_file (retval,
+ keyfile_filename,
+ G_KEY_FILE_NONE,
+ &error);
+
+ if (error != NULL) {
+ if (!g_error_matches (error,
+ G_FILE_ERROR,
+ G_FILE_ERROR_NOENT)) {
+ g_print ("Unable to open the desktop metadata keyfile: %s\n",
+ error->message);
+ }
+
+ g_error_free (error);
+ }
+
+ data = g_slice_new0 (KeyfileMetadataData);
+ data->keyfile = retval;
+
+ return data;
+}
+
+static void
+keyfile_metadata_data_free (KeyfileMetadataData *data)
+{
+ g_key_file_unref (data->keyfile);
+
+ if (data->save_in_idle_id != 0) {
+ g_source_remove (data->save_in_idle_id);
+ }
+
+ g_slice_free (KeyfileMetadataData, data);
+}
+
+static GKeyFile *
+get_keyfile (const char *keyfile_filename)
+{
+ KeyfileMetadataData *data;
+
+ if (data_hash == NULL) {
+ data_hash = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ (GDestroyNotify) keyfile_metadata_data_free);
+ }
+
+ data = g_hash_table_lookup (data_hash, keyfile_filename);
+
+ if (data == NULL) {
+ data = keyfile_metadata_data_new (keyfile_filename);
+
+ g_hash_table_insert (data_hash,
+ g_strdup (keyfile_filename),
+ data);
+ }
+
+ return data->keyfile;
+}
+
+static gboolean
+save_in_idle_cb (const gchar *keyfile_filename)
+{
+ KeyfileMetadataData *data;
+ gchar *contents;
+ gsize length;
+ GError *error = NULL;
+
+ data = g_hash_table_lookup (data_hash, keyfile_filename);
+ data->save_in_idle_id = 0;
+
+ contents = g_key_file_to_data (data->keyfile, &length, NULL);
+
+ if (contents != NULL) {
+ g_file_set_contents (keyfile_filename,
+ contents, length,
+ &error);
+ g_free (contents);
+ }
+
+ if (error != NULL) {
+ g_warning ("Couldn't save the desktop metadata keyfile to disk: %s",
+ error->message);
+ g_error_free (error);
+ }
+
+ return FALSE;
+}
+
+static void
+save_in_idle (const char *keyfile_filename)
+{
+ KeyfileMetadataData *data;
+
+ g_return_if_fail (data_hash != NULL);
+
+ data = g_hash_table_lookup (data_hash, keyfile_filename);
+ g_return_if_fail (data != NULL);
+
+ if (data->save_in_idle_id != 0) {
+ return;
+ }
+
+ data->save_in_idle_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ (GSourceFunc) save_in_idle_cb,
+ g_strdup (keyfile_filename),
+ g_free);
+}
+
+void
+nautilus_keyfile_metadata_set_string (NautilusFile *file,
+ const char *keyfile_filename,
+ const gchar *name,
+ const gchar *key,
+ const gchar *string)
+{
+ GKeyFile *keyfile;
+
+ keyfile = get_keyfile (keyfile_filename);
+
+ g_key_file_set_string (keyfile,
+ name,
+ key,
+ string);
+
+ save_in_idle (keyfile_filename);
+
+ if (nautilus_keyfile_metadata_update_from_keyfile (file, keyfile_filename, name)) {
+ nautilus_file_changed (file);
+ }
+}
+
+#define STRV_TERMINATOR "@x-nautilus-desktop-metadata-term@"
+
+void
+nautilus_keyfile_metadata_set_stringv (NautilusFile *file,
+ const char *keyfile_filename,
+ const char *name,
+ const char *key,
+ const char * const *stringv)
+{
+ GKeyFile *keyfile;
+ guint length;
+ gchar **actual_stringv = NULL;
+ gboolean free_strv = FALSE;
+
+ keyfile = get_keyfile (keyfile_filename);
+
+ /* if we would be setting a single-length strv, append a fake
+ * terminator to the array, to be able to differentiate it later from
+ * the single string case
+ */
+ length = g_strv_length ((gchar **) stringv);
+
+ if (length == 1) {
+ actual_stringv = g_malloc0 (3 * sizeof (gchar *));
+ actual_stringv[0] = (gchar *) stringv[0];
+ actual_stringv[1] = STRV_TERMINATOR;
+ actual_stringv[2] = NULL;
+
+ length = 2;
+ free_strv = TRUE;
+ } else {
+ actual_stringv = (gchar **) stringv;
+ }
+
+ g_key_file_set_string_list (keyfile,
+ name,
+ key,
+ (const gchar **) actual_stringv,
+ length);
+
+ save_in_idle (keyfile_filename);
+
+ if (nautilus_keyfile_metadata_update_from_keyfile (file, keyfile_filename, name)) {
+ nautilus_file_changed (file);
+ }
+
+ if (free_strv) {
+ g_free (actual_stringv);
+ }
+}
+
+gboolean
+nautilus_keyfile_metadata_update_from_keyfile (NautilusFile *file,
+ const char *keyfile_filename,
+ const gchar *name)
+{
+ gchar **keys, **values;
+ const gchar *actual_values[2];
+ const gchar *key, *value;
+ gchar *gio_key;
+ gsize length, values_length;
+ GKeyFile *keyfile;
+ GFileInfo *info;
+ gint idx;
+ gboolean res;
+
+ keyfile = get_keyfile (keyfile_filename);
+
+ keys = g_key_file_get_keys (keyfile,
+ name,
+ &length,
+ NULL);
+
+ if (keys == NULL) {
+ return FALSE;
+ }
+
+ info = g_file_info_new ();
+
+ for (idx = 0; idx < length; idx++) {
+ key = keys[idx];
+ values = g_key_file_get_string_list (keyfile,
+ name,
+ key,
+ &values_length,
+ NULL);
+
+ gio_key = g_strconcat ("metadata::", key, NULL);
+
+ if (values_length < 1) {
+ continue;
+ } else if (values_length == 1) {
+ g_file_info_set_attribute_string (info,
+ gio_key,
+ values[0]);
+ } else if (values_length == 2) {
+ /* deal with the fact that single-length strv are stored
+ * with an additional terminator in the keyfile string, to differentiate
+ * them from the regular string case.
+ */
+ value = values[1];
+
+ if (g_strcmp0 (value, STRV_TERMINATOR) == 0) {
+ /* if the 2nd value is the terminator, remove it */
+ actual_values[0] = values[0];
+ actual_values[1] = NULL;
+
+ g_file_info_set_attribute_stringv (info,
+ gio_key,
+ (gchar **) actual_values);
+ } else {
+ /* otherwise, set it as a regular strv */
+ g_file_info_set_attribute_stringv (info,
+ gio_key,
+ values);
+ }
+ } else {
+ g_file_info_set_attribute_stringv (info,
+ gio_key,
+ values);
+ }
+
+ g_free (gio_key);
+ g_strfreev (values);
+ }
+
+ res = nautilus_file_update_metadata_from_info (file, info);
+
+ g_strfreev (keys);
+ g_object_unref (info);
+
+ return res;
+}
diff --git a/libnautilus-private/nautilus-keyfile-metadata.h b/libnautilus-private/nautilus-keyfile-metadata.h
new file mode 100644
index 0000000..db9eb69
--- /dev/null
+++ b/libnautilus-private/nautilus-keyfile-metadata.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Nautilus
+ *
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <cosimoc redhat com>
+ */
+
+#ifndef __NAUTILUS_KEYFILE_METADATA_H__
+#define __NAUTILUS_KEYFILE_METADATA_H__
+
+#include <glib.h>
+
+#include <libnautilus-private/nautilus-file.h>
+
+void nautilus_keyfile_metadata_set_string (NautilusFile *file,
+ const char *keyfile_filename,
+ const gchar *name,
+ const gchar *key,
+ const gchar *string);
+
+void nautilus_keyfile_metadata_set_stringv (NautilusFile *file,
+ const char *keyfile_filename,
+ const char *name,
+ const char *key,
+ const char * const *stringv);
+
+gboolean nautilus_keyfile_metadata_update_from_keyfile (NautilusFile *file,
+ const char *keyfile_filename,
+ const gchar *name);
+
+#endif /* __NAUTILUS_KEYFILE_METADATA_H__ */
diff --git a/libnautilus-private/nautilus-search-directory-file.c
b/libnautilus-private/nautilus-search-directory-file.c
index 9b22c9d..8bad8f6 100644
--- a/libnautilus-private/nautilus-search-directory-file.c
+++ b/libnautilus-private/nautilus-search-directory-file.c
@@ -31,6 +31,7 @@
#include "nautilus-file-attributes.h"
#include "nautilus-file-private.h"
#include "nautilus-file-utilities.h"
+#include "nautilus-keyfile-metadata.h"
#include <eel/eel-glib-extensions.h>
#include "nautilus-search-directory.h"
#include <gtk/gtk.h>
@@ -38,7 +39,7 @@
#include <string.h>
struct NautilusSearchDirectoryFileDetails {
- NautilusSearchDirectory *search_directory;
+ gchar *metadata_filename;
};
G_DEFINE_TYPE(NautilusSearchDirectoryFile, nautilus_search_directory_file, NAUTILUS_TYPE_FILE);
@@ -160,6 +161,32 @@ search_directory_file_get_where_string (NautilusFile *file)
return g_strdup (_("Search"));
}
+static void
+search_directory_file_set_metadata (NautilusFile *file,
+ const char *key,
+ const char *value)
+{
+ NautilusSearchDirectoryFile *search_file;
+
+ search_file = NAUTILUS_SEARCH_DIRECTORY_FILE (file);
+ nautilus_keyfile_metadata_set_string (file,
+ search_file->details->metadata_filename,
+ "directory", key, value);
+}
+
+static void
+search_directory_file_set_metadata_as_list (NautilusFile *file,
+ const char *key,
+ char **value)
+{
+ NautilusSearchDirectoryFile *search_file;
+
+ search_file = NAUTILUS_SEARCH_DIRECTORY_FILE (file);
+ nautilus_keyfile_metadata_set_stringv (file,
+ search_file->details->metadata_filename,
+ "directory", key, (const gchar **) value);
+}
+
void
nautilus_search_directory_file_update_display_name (NautilusSearchDirectoryFile *search_file)
{
@@ -198,9 +225,20 @@ static void
nautilus_search_directory_file_init (NautilusSearchDirectoryFile *search_file)
{
NautilusFile *file;
+ gchar *xdg_dir;
file = NAUTILUS_FILE (search_file);
+ search_file->details = G_TYPE_INSTANCE_GET_PRIVATE (search_file,
+ NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE,
+ NautilusSearchDirectoryFileDetails);
+
+ xdg_dir = nautilus_get_user_directory ();
+ search_file->details->metadata_filename = g_build_filename (xdg_dir,
+ "search-metadata",
+ NULL);
+ g_free (xdg_dir);
+
file->details->got_file_info = TRUE;
file->details->mime_type = eel_ref_str_get_unique ("x-directory/normal");
file->details->type = G_FILE_TYPE_DIRECTORY;
@@ -221,12 +259,28 @@ nautilus_search_directory_file_init (NautilusSearchDirectoryFile *search_file)
}
static void
+nautilus_search_directory_file_finalize (GObject *object)
+{
+ NautilusSearchDirectoryFile *search_file;
+
+ search_file = NAUTILUS_SEARCH_DIRECTORY_FILE (object);
+
+ g_free (search_file->details->metadata_filename);
+
+ G_OBJECT_CLASS (nautilus_search_directory_file_parent_class)->finalize (object);
+}
+
+static void
nautilus_search_directory_file_class_init (NautilusSearchDirectoryFileClass *klass)
{
+ GObjectClass *object_class;
NautilusFileClass *file_class;
+ object_class = G_OBJECT_CLASS (klass);
file_class = NAUTILUS_FILE_CLASS (klass);
+ object_class->finalize = nautilus_search_directory_file_finalize;
+
file_class->default_file_type = G_FILE_TYPE_DIRECTORY;
file_class->monitor_add = search_directory_file_monitor_add;
@@ -237,4 +291,8 @@ nautilus_search_directory_file_class_init (NautilusSearchDirectoryFileClass *kla
file_class->get_item_count = search_directory_file_get_item_count;
file_class->get_deep_counts = search_directory_file_get_deep_counts;
file_class->get_where_string = search_directory_file_get_where_string;
+ file_class->set_metadata = search_directory_file_set_metadata;
+ file_class->set_metadata_as_list = search_directory_file_set_metadata_as_list;
+
+ g_type_class_add_private (object_class, sizeof(NautilusSearchDirectoryFileDetails));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
