#include <libxml/xmlreader.h>
#include "ev-metadata-manager.h"
+#include "ev-application.h"
#include "ev-file-helpers.h"
#define METADATA_FILE "ev-metadata.xml"
gboolean values_loaded; /* It is true if the file
has been read */
- gboolean modified; /* It is true if the file
- has top be written */
-
guint timeout_id;
GHashTable *items;
static void
item_free (gpointer data)
{
- Item *item;
-
- g_return_if_fail (data != NULL);
-
- item = (Item *)data;
+ Item *item = (Item *) data;
if (item->values != NULL)
g_hash_table_destroy (item->values);
- g_free (item);
+ g_slice_free (Item, item);
+}
+
+/**
+ * ev_metadata_arm_timeout
+ *
+ * Setup a timeout for saving the metadata to disk.
+ */
+static void
+ev_metadata_arm_timeout(void)
+{
+ if (ev_metadata_manager->timeout_id)
+ return;
+
+ ev_metadata_manager->timeout_id =
+ g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
+ 2,
+ (GSourceFunc)ev_metadata_manager_save,
+ NULL,
+ NULL);
}
/**
* Creates an EvMetadataManager with default values.
*
* values_loaded -> %FALSE.
- * modified -> %FALSE.
* timeout_id -> the id of the event source.
* items -> a new full empty #GHashTable.
*/
void
ev_metadata_manager_init (void)
{
- ev_metadata_manager = g_new0 (EvMetadataManager, 1);
+ ev_metadata_manager = g_slice_new0 (EvMetadataManager);
ev_metadata_manager->values_loaded = FALSE;
- ev_metadata_manager->modified = FALSE;
ev_metadata_manager->items =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
item_free);
-
- ev_metadata_manager->timeout_id =
- g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
- 2000, /* 2 sec */
- (GSourceFunc)ev_metadata_manager_save,
- NULL,
- NULL);
}
/* This function must be called before exiting ev */
if (ev_metadata_manager == NULL)
return;
- g_source_remove (ev_metadata_manager->timeout_id);
-
- ev_metadata_manager_save (NULL);
+ if (ev_metadata_manager->timeout_id) {
+ g_source_remove (ev_metadata_manager->timeout_id);
+ ev_metadata_manager->timeout_id = 0;
+ ev_metadata_manager_save (NULL);
+ }
if (ev_metadata_manager->items != NULL)
g_hash_table_destroy (ev_metadata_manager->items);
- g_free (ev_metadata_manager);
+ g_slice_free (EvMetadataManager, ev_metadata_manager);
ev_metadata_manager = NULL;
}
GValue *value = (GValue *)data;
g_value_unset (value);
- g_free (value);
+ g_slice_free (GValue, value);
}
static GValue *
GValue *ret;
ret_type = g_type_from_name ((char *)type);
- ret = g_new0 (GValue, 1);
+ ret = g_slice_new0 (GValue);
g_value_init (ret, ret_type);
switch (ret_type) {
return;
}
- item = g_new0 (Item, 1);
+ item = g_slice_new0 (Item);
item->atime = g_ascii_strtoull((char*)atime, NULL, 0);
xmlKeepBlanksDefault (0);
/* FIXME: file locking - Paolo */
- file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL);
+ file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL);
if (!g_file_test (file_name, G_FILE_TEST_EXISTS))
{
g_free (file_name);
if (item == NULL)
{
- item = g_new0 (Item, 1);
+ item = g_slice_new0 (Item);
g_hash_table_insert (ev_metadata_manager->items,
g_strdup (LAST_URI),
if (value != NULL) {
GValue *new;
- new = g_new0 (GValue, 1);
+ new = g_slice_new0 (GValue);
g_value_init (new, G_VALUE_TYPE (value));
g_value_copy (value, new);
}
item->atime = time (NULL);
- ev_metadata_manager->modified = TRUE;
+ ev_metadata_arm_timeout ();
return;
}
if (item == NULL)
{
- item = g_new0 (Item, 1);
+ item = g_slice_new0 (Item);
g_hash_table_insert (ev_metadata_manager->items,
g_strdup (uri),
if (value != NULL) {
GValue *new;
- new = g_new0 (GValue, 1);
+ new = g_slice_new0 (GValue);
g_value_init (new, G_VALUE_TYPE (value));
g_value_copy (value, new);
item->atime = time (NULL);
- ev_metadata_manager->modified = TRUE;
+ ev_metadata_arm_timeout ();
}
static void
switch (G_VALUE_TYPE (value)) {
case G_TYPE_STRING:
- string_value = g_strdup (g_value_get_string (value));
+ string_value = g_value_dup_string (value);
break;
case G_TYPE_INT:
string_value = g_strdup_printf ("%d", g_value_get_int (value));
{
gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, g_value_get_double (value));
- string_value = g_strdup_printf ("%s", buf);
+ string_value = g_strdup (buf);
}
break;
case G_TYPE_BOOLEAN:
xmlNodePtr root;
gchar *file_name;
- if (!ev_metadata_manager->modified)
- return TRUE;
+ ev_metadata_manager->timeout_id = 0;
resize_items ();
(GHFunc)save_item, root);
/* FIXME: lock file - Paolo */
- file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL);
+ file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL);
xmlSaveFormatFile (file_name, doc, 1);
g_free (file_name);
xmlFreeDoc (doc);
- ev_metadata_manager->modified = FALSE;
-
- return TRUE;
+ return FALSE;
}
void
GValue val = { 0, };
g_value_init (&val, G_TYPE_STRING);
- g_value_set_string (&val, value);
+ g_value_set_static_string (&val, value);
ev_metadata_manager_set (uri, key, &val);